From 63e8e2c3316ddca8f1dc868d0394f0a8a54e7dc6 Mon Sep 17 00:00:00 2001
From: Imre Farkas <ifarkas@gitlab.com>
Date: Wed, 29 May 2019 12:49:56 +0000
Subject: CE port of Move EE specific lines in API::ProtectedBranches

---
 lib/api/helpers/protected_branches_helpers.rb | 13 +++++++++++++
 lib/api/protected_branches.rb                 | 26 +++-----------------------
 2 files changed, 16 insertions(+), 23 deletions(-)
 create mode 100644 lib/api/helpers/protected_branches_helpers.rb

diff --git a/lib/api/helpers/protected_branches_helpers.rb b/lib/api/helpers/protected_branches_helpers.rb
new file mode 100644
index 00000000000..0fc6841d79a
--- /dev/null
+++ b/lib/api/helpers/protected_branches_helpers.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module API
+  module Helpers
+    module ProtectedBranchesHelpers
+      extend ActiveSupport::Concern
+      extend Grape::API::Helpers
+
+      params :optional_params_ee do
+      end
+    end
+  end
+end
diff --git a/lib/api/protected_branches.rb b/lib/api/protected_branches.rb
index f8cce1ed784..33dea25289a 100644
--- a/lib/api/protected_branches.rb
+++ b/lib/api/protected_branches.rb
@@ -8,6 +8,8 @@ module API
 
     before { authorize_admin_project }
 
+    helpers Helpers::ProtectedBranchesHelpers
+
     params do
       requires :id, type: String, desc: 'The ID of a project'
     end
@@ -52,29 +54,7 @@ module API
                                       values: ProtectedBranch::MergeAccessLevel.allowed_access_levels,
                                       desc: 'Access levels allowed to merge (defaults: `40`, maintainer access level)'
 
-        if Gitlab.ee?
-          optional :unprotect_access_level, type: Integer,
-                                            values: ProtectedBranch::UnprotectAccessLevel.allowed_access_levels,
-                                            desc: 'Access levels allowed to unprotect (defaults: `40`, maintainer access level)'
-
-          optional :allowed_to_push, type: Array, desc: 'An array of users/groups allowed to push' do
-            optional :access_level, type: Integer, values: ProtectedBranch::PushAccessLevel.allowed_access_levels
-            optional :user_id, type: Integer
-            optional :group_id, type: Integer
-          end
-
-          optional :allowed_to_merge, type: Array, desc: 'An array of users/groups allowed to merge' do
-            optional :access_level, type: Integer, values: ProtectedBranch::MergeAccessLevel.allowed_access_levels
-            optional :user_id, type: Integer
-            optional :group_id, type: Integer
-          end
-
-          optional :allowed_to_unprotect, type: Array, desc: 'An array of users/groups allowed to unprotect' do
-            optional :access_level, type: Integer, values: ProtectedBranch::UnprotectAccessLevel.allowed_access_levels
-            optional :user_id, type: Integer
-            optional :group_id, type: Integer
-          end
-        end
+        use :optional_params_ee
       end
       # rubocop: disable CodeReuse/ActiveRecord
       post ':id/protected_branches' do
-- 
cgit v1.2.1