Merge "integration" into deployment-portage #712
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
Bumps [mysql2](https://github.com/brianmario/mysql2) from 0.5.5 to 0.5.6. - [Release notes](https://github.com/brianmario/mysql2/releases) - [Commits](brianmario/mysql2@0.5.5...0.5.6) --- updated-dependencies: - dependency-name: mysql2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…ment-portage/mysql2-0.5.6 Bump mysql2 from 0.5.5 to 0.5.6
Edit Webmock allowed requests to get chromedriver
This adds the terms and conditions checkbox to the devise invitation form. In addition, `accept_terms` has been added to devise_parameter_sanitizer.permit(). This change is required in order for `accept_terms` to be updated within the update method of Devise::InvitationsController.
This change results in the user being unable to submit the invitation form unless the accept terms checkbox is actually checked. The checkbox handling here is a bit different from the checkbox handling within the create account section of the homepage (see the create method within RegistrationsController). We could do the same here, but it would require a bit more work. Specifically, we'd have to override the Devise::InvitationsController update method within InvitationsController. Also, a bit of extra handling would be required within the DeviseController require_no_authentication method that we are already overriding within InvitationsController.
This change enables app errors to be sent to rollbar.com `config/initializers/rollbar.rb` includes the following line: `config.enabled = false if Rails.env.test?` Thus, having the gem as part of the :default group should be okay. `rake rollbar:test` can be executed to send a test message to rollbar.com. However, this rake task doesn't work when `require: false` is part of the gem 'rollbar' config.
Edit Rollbar Gem To Enable Tracking on rollbar.com
Prior to this commit, all of the templates were simply being sorted by title. Now, the sorting follows the instructions specified within the following GitHub issue comment: #685 (comment)
The `funder.present? && !funder.new_record?` check was being unnecessarily repeated. NOTE: This file features a lot of code exclusive to DMP Assistant. I feel like it could be further cleaned up.
Commit d127444 removed this assignment. However, considering that this instance variable may be used by some corresponding views, this commit puts back the assignment.
Fix Ordering of Templates Within Create Plan Template Dropdown
Add Terms and Conditions For Invitation Form
aaronskiba
changed the title
Merge release `4.0.2+portage-4.0.2` hotfix changes into integration
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.
As specified by the updated CHANGELOG.md, this merge includes the following code changes:
Added
Bump mysql2 from 0.5.5 to 0.5.6 #645
Added "Accept terms and conditions" checkbox to invitation form #684
Fixed
Updated Webmock's allowed request list to enable fetching of chromedriver #670
Edit Gemfile config for 'rollbar' to enable app tracking on rollbar.com #687
Fxed ordering of templates within the "Create a new plan" template dropdown #706