Merge branch '40843-update-grape-to-v1-0-2-when-it-is-released' into 'master'

Resolve "Update grape to v1.0.2 when it is released"

Closes #40843

See merge request gitlab-org/gitlab-ce!17983

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)

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?