Bump rails from 2d196d4
to 5de585e
#165
Merged
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.
Bumps rails from
2d196d4
to5de585e
.Commits
5de585e
Merge pull request #49456 from seanpdoyle/strong-parameters-deep-merge-rdoc5c3cb9f
FixActionController::Parameters#deep_merge
RDoc [ci skip]832fb1d
Merge pull request #49454 from Shopify/jruby-skip7d58fe9
Fix typo02e679b
Get rid of thejruby_skip
test helperb10a2e4
[ci-skip][Docs]Add encryption.add_to_filter_parameters to configuring.md (#49...af2b1da
Merge pull request #49452 from Shopify/pg-ensure-type-map-loaded618db13
Ensure PG connection is configured before looking up types7c303b9
Merge pull request #49442 from p8/actionpack/notifications-tests5b159f4
Merge pull request #49437 from tnir/tn-remove-config-on-skip-acDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditions
will show all of the ignore conditions of the specified dependency@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)