Fixes #37434 - Use nightly for develop manual links #10155
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
evgeni
reviewed
May 13, 2024
app/controllers/links_controller.rb
Outdated
| @@ -54,7 +54,8 @@ def foreman_org_path(sub_path) | |||
| end | |||
|
|
|||
| def documentation_url(section = "", options = {}) | |||
| root_url = options[:root_url] || foreman_org_path("manuals/#{SETTINGS[:version].short}/index.html#") | |||
| version = SETTINGS[:version].tag == 'develop' ? 'nightly' : SETTINGS[:version].short | |||
There was a problem hiding this comment.
We already have
Time to it to become a real method?
There was a problem hiding this comment.
I thought about it too and will update.
Foreman has for the longest time had https://theforeman.org/manuals/$next redirect to https://theforeman.org/manuals/nightly in our Apache configuration. This means that on every branching we need to modify this. It also doesn't play well with caching and using pure static webservers. If Foreman uses nightly as the version, this whole redirect is no longer needed.
evgeni
force-pushed
the
37434-use-nightly-for-manuals
branch
from
45a710e to
86f2bfe
Compare
|
@ekohl I took the liberty to refactor this :) |
evgeni
reviewed
May 17, 2024
ehelms
approved these changes
May 17, 2024
evgeni
added a commit
to theforeman/foreman-infra
that referenced
this pull request
May 17, 2024
Foreman correctly generates "nightly" links since theforeman/foreman#10155
Thanks! |
ekohl
pushed a commit
to theforeman/foreman-infra
that referenced
this pull request
May 17, 2024
Foreman correctly generates "nightly" links since theforeman/foreman#10155
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Foreman has for the longest time had
https://theforeman.org/manuals/$nextredirect tohttps://theforeman.org/manuals/nightlyin our Apache configuration. This means that on every branching we need to modify this. It also doesn't play well with caching and using pure static webservers.If Foreman uses nightly as the version, this whole redirect is no longer needed.