Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use full prefix in sitemap urls #4035

Merged
merged 10 commits into from
Apr 25, 2019
Merged

Use full prefix in sitemap urls #4035

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
327bec5
fix sitemap
Apr 18, 2019
1e70c82
fix linting
Apr 18, 2019
376a37b
change isDemo flag
Apr 18, 2019
e9c8446
update snapshots
Apr 18, 2019
f4c8af6
http scheme as val
fm3 Apr 23, 2019
4593df2
conf.http.uri
fm3 Apr 23, 2019
9d2e7fe
undo not on master
fm3 Apr 23, 2019
6847be6
Merge branch 'master' into fix-sitemap
fm3 Apr 23, 2019
9b729a5
new snapshots
fm3 Apr 23, 2019
9a13542
Merge branch 'master' into fix-sitemap
youri-k Apr 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/RequestHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class RequestHandler @Inject()(router: Router,
val path = request.path.replaceFirst("^(/assets/)", "")
Some(assets.at(path = "/public", file = path))
} else if (request.uri.matches("""^/sitemap.xml$""") && conf.Features.isDemoInstance) {
Some(sitemapController.getSitemap(Some(request.host)))
Some(sitemapController.getSitemap(Some(conf.Http.uri)))
} else {
Some(Action { Ok(views.html.main(conf)) })
}
Expand Down