Merge deployment-portage Code Changes Into integration
#913
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
Merge `integration` Changes For Upcoming `4.1.1+portage-4.1.3`
Update CHANGELOG.md For Release `4.1.1+portage-4.1.3`
Merge Changes For Upcoming Release `4.1.1+portage-4.2.0`
…r-release Update CHANGELOG.md For Release `4.1.1+portage-4.2.0`
This commit allows for the production, sandbox, and staging environments to have multiple hosts added to config.hosts. (config.hosts sets the allowed list. A 403 will be encountered by the user if they try to navigate to a hostname that is missing from config.hosts)
Patch to allow multiple hosts when setting config of some environments
Previously, SSO account linking of existing accounts was possible for signed-out users. This commit disables that functionality. Users must now be signed into the app to link to an existing account.
This change adds the PR idea from #902. The change seeks to address the following issue: #900 Co-Authored-By: Omar Rodriguez Arenas <[email protected]>
The corresponding French translation of this text is too long to only be a single line long. To address that, `.html_safe` has been added here, which enables the correct behaviour when adding the `<br>` tag for the French translation on translation.io
Link to approved text: #907 (comment)
To work properly, this test relies on the `current_user` method within `app/controllers/users/omniauth_callbacks_controller.rb`. Howerver, `current_user` is not currently behaving as expected there. Thus, the test is being commented out.
String changes to the SSO CILogon Sign-in button
Update Handling of SSO Linking
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.
Changes proposed in this PR:
deployment-portage. Merging this PR will bringintegrationback up-to-date withdeployment-portage.