diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-03-26 01:43:43 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-03-26 01:43:43 +0100 |
| commit | a47565aa14e91841db7e404980df02775d7db90b (patch) | |
| tree | aee18bbf2b6cae1a99635f74620a6edc0507bb94 | |
| parent | 391732a2c1b04baf565c77f2788a1ec035b1d85e (diff) | |
| download | gitlab-ce-40843-update-grape-to-v1-0-2-when-it-is-released.tar.gz | |
Updated grape to `1.0.2` to remove workaround40843-update-grape-to-v1-0-2-when-it-is-released
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | lib/api/protected_branches.rb | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a92843f32d8..8a4c1255988 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/lib/api/protected_branches.rb b/lib/api/protected_branches.rb index c15c487deb4..c65105ff8b0 100644 --- a/lib/api/protected_branches.rb +++ b/lib/api/protected_branches.rb @@ -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? |