Fix route requirements bug #1788
Merged
Conversation
This file contains hidden or 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
darren987469
force-pushed
the
fix_route_requirements_bug
branch
from
ee84cdc to
b473fc0
Compare
This was a bug introduced by commit 9f4ba67. The commit replaces `options[:route_options].clone.merge(...)` with `options[:route_options].clone.reverse_merge(...)`. That causes disappear of the requirements in namespace.
darren987469
force-pushed
the
fix_route_requirements_bug
branch
from
b473fc0 to
c701d48
Compare
Member
|
Amazing, merged. |
|
Thanks @darren987469! Looks great. |
terrchen
pushed a commit
to terrchen/gitlab
that referenced
this pull request
Jul 9, 2020
The issue is that the requirement: for the route was clobbering the requirement: for the containing namespace. This was since fixed in ruby-grape/grape#1788, and pulled in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33450.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Fix spec in #1783
This was a bug introduced by commit 9f4ba67.
The commit replaces options[:route_options].clone.merge(...) with options[:route_options].clone.reverse_merge(...).
That causes disappear of the requirements in namespace.