From a47565aa14e91841db7e404980df02775d7db90b Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Mon, 26 Mar 2018 01:43:43 +0100
Subject: [PATCH] Updated grape to `1.0.2` to remove workaround
---
Gemfile.lock | 4 ++--
lib/api/protected_branches.rb | 7 +------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index a92843f32d871..8a4c125598887 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 c15c487deb495..c65105ff8b0d3 100644
--- a/lib/api/protected_branches.rb
+++ b/lib/api/protected_branches.rb
@@ -52,12 +52,7 @@ class ProtectedBranches < Grape::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?
--
GitLab