Merge Upstream Releases v4.1.0 and v4.1.1 #700
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
… limit to resetting the password. The Rack-Attack middleware for blocking & throttling abusive requests is being used. https://github.com/rack/rack-attack/blob/6-stable/README.md Changes: - Added rack-attack version 6.6.1 gem. https://rubygems.org/gems/rack-attack/versions/6.6.1 - Added config/initializers/rack_attack.rb: - The rack-attack functionality is enabled with Rack::Attack.enabled = true but may be switched off Rack::Attack.enabled = false. - Password reset requests are currently throttled from from an IP address for POSTs to path /users/passwords and is limited 2 requests every 30 seconds. ess - Login requests are throttled from an IP address for POSTs to path /users/sign_in and is limited 4 requests every 30 seconds. - A new html page public/429.html with title "Too Many Request" is added.
This code was added during commit 466d57a (there was no merge conflict to resolve).
For commit 54ba0ad, our current changes were kept within `app/assets/stylesheets/variables/_colours.scss` to maintain our styling. However, the v4.1.0 release changed `$color-seccondary-text` to `$color-secondary-text` and `$color-seccondary-background` to `$color-secondary-background`. Because the release changes the names of these variables in many other .scss files, we are applying the change here as well.
The files within this commit reference bootstrap variables, which in turn reference variables from `app/assets/stylesheets/variables/_colours.scss`. Without these extra use statements, we could not compile the assets.
app/assets/stylesheets/application.scss - Changed `@use "variables";` to `@use "variables" as *;` This enables our overrides to take effect when the Bootstrap stylesheets are imported. - Changed `@use` to `@import` for blocks and utils and moved the statements to be executed after the Bootstrap imports. This enables the customisations within these files to take effect. All app/assets/stylesheets/blocks/_x.scss files that included `@use "../../../../node_modules/bootstrap-sass/assets/stylesheets/_bootstrap.scss" as *;` - Changed `@use "../../../../node_modules/bootstrap-sass/assets/stylesheets/_bootstrap.scss" as *;` to `@import '../../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables';` The former statement was undoing our overrides specified within `app/assets/stylesheets/variables/` app/assets/stylesheets/blocks/_navbars.scss - Added `!optional` to `@extend .navbar-inverse;`. The removal of `@use "../../../../node_modules/bootstrap-sass/assets/stylesheets/_bootstrap.scss" as *;` necessitated this change (the same approach is being used in the following DMPRoadmap PR: DMPRoadmap#3374) All public/tinymce/skins/oxide/ files - These were auto-generated after executing `rake assets:clobber && rake assets:precompile`
According to https://github.com/titusfortner/webdrivers: "If you can update to the latest version of Selenium (4.11+), please do so and stop requiring this gem." Gemfile - Replace webdrivers with selenium-webdriver Gemfile.lock - Ran `bundle install` && `bundle update selenium-webdriver` spec/rails_helper.rb - Only allow localhost (`allow: %w[chromedriver.storage.googleapis.com]` was only needed for the Webdrivers gem) spec/spec_helper.rb - Clean up code spec/support/capybara.rb - Remove references to removed Webdrivers gem
Without this modification, the selenium tests often trigger a 429 / Too Many Requests error. (Perhaps this should be applied to "/users/password" as well?)
:selenium_chrome_headless driver has a default window-size of (800x600). This small window-size seems to result in the following error for all features tests (because the button isn't being rendered on the screen):
Failure/Error: click_button 'Sign in'
Selenium::WebDriver::Error::ElementClickInterceptedError:
These modifications are required so that these tests pass.
The v4.1.0 release replaced webpacker with jsbundling-rails and cssbundling-rails for the Javascript & CSS compilation. https://github.com/DMPRoadmap/roadmap/releases/tag/v4.1.0 As a result, it is necessary to remove these lines of code.
The commit 54ba0ad updated the Ruby version. This commit reflects that update.
app/controllers/plan_exports_controller.rb - Line 125 was removed because it was essentially just a duplicate of line 127 (line 127 was added during commit 54ba0ad) lib/tasks/export_portage.rake - Added `rubocop:disable` to ignore these offences. However, the following GitHub issue has been created to further investigate the effects of these offences on their associated rake task. #699
Generated by 🚫 Danger |
aaronskiba
changed the title
This was referenced May 1, 2024
Closed
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:
./spec/features/were not initially working. This PR includes the fixes for those tests.app/assets/stylesheets/undid a lot of our previous styling. This PR includes fixes for that. The approach for that was largely copied from the changes within the following DMPRoadmap PR: Issue #3144 - Upgrade to Bootstrap 5 DMPRoadmap/roadmap#3374