kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Updated grape to 1.0.2 to remove workaround

Browse source
This commit is contained in:
James Edwards-Jones 2018-03-26 01:43:43 +01:00
parent 391732a2c1
commit a47565aa14
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile.lock
View file

@ -357,7 +357,7 @@ GEM
signet (~> 0.7)
gpgme (2.0.13)
mini_portile2 (~> 2.1)
grape (1.0.0)
grape (1.0.2)
activesupport
builder
mustermann-grape (~> 1.0.0)
@ -507,7 +507,7 @@ GEM
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
mustermann (1.0.0)
mustermann (1.0.2)
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
mysql2 (0.4.10)

7
lib/api/protected_branches.rb
View file

@ -52,12 +52,7 @@ module API
conflict!("Protected branch '#{params[:name]}' already exists")
end
# Replace with `declared(params)` after updating to grape v1.0.2
# See https://github.com/ruby-grape/grape/pull/1710
# and https://gitlab.com/gitlab-org/gitlab-ce/issues/40843
declared_params = params.slice("name", "push_access_level", "merge_access_level", "allowed_to_push", "allowed_to_merge")
api_service = ::ProtectedBranches::ApiService.new(user_project, current_user, declared_params)
api_service = ::ProtectedBranches::ApiService.new(user_project, current_user, declared(params))
protected_branch = api_service.create
if protected_branch.persisted?