Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5373480e
Commit
5373480e
authored
Mar 26, 2018
by
James Edwards-Jones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ProtectedBranch API omits empty declared params
parent
e9903338
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
ee/app/services/ee/protected_branches/api_service.rb
ee/app/services/ee/protected_branches/api_service.rb
+1
-1
lib/api/protected_branches.rb
lib/api/protected_branches.rb
+2
-1
No files found.
ee/app/services/ee/protected_branches/api_service.rb
View file @
5373480e
...
...
@@ -11,7 +11,7 @@ module EE
super
rescue
::
EE
::
ProtectedBranches
::
ApiService
::
GroupsNotAccessibleError
,
::
EE
::
ProtectedBranches
::
ApiService
::
UsersNotAccessibleError
ProtectedBranch
.
new
.
tap
do
|
protected_branch
|
::
ProtectedBranch
.
new
.
tap
do
|
protected_branch
|
message
=
'Cannot add users or groups unless they have access to the project'
protected_branch
.
errors
.
add
(
:base
,
message
)
end
...
...
lib/api/protected_branches.rb
View file @
5373480e
...
...
@@ -62,7 +62,8 @@ module API
conflict!
(
"Protected branch '
#{
params
[
:name
]
}
' already exists"
)
end
api_service
=
::
ProtectedBranches
::
ApiService
.
new
(
user_project
,
current_user
,
declared
(
params
))
declared_params
=
declared_params
(
include_missing:
false
)
api_service
=
::
ProtectedBranches
::
ApiService
.
new
(
user_project
,
current_user
,
declared_params
)
protected_branch
=
api_service
.
create
if
protected_branch
.
persisted?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment