Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 13 deletions

diff --git a/app/graphql/types/branch_protections/base_access_level_type.rb b/app/graphql/types/branch_protections/base_access_level_type.rb
index 472733a6bc5..e6514ba8d7d 100644
--- a/app/graphql/types/branch_protections/base_access_level_type.rb
+++ b/app/graphql/types/branch_protections/base_access_level_type.rb
@@ -14,7 +14,7 @@ module Types
             type: GraphQL::Types::String,
             null: false,
             description: 'Human readable representation for this access level.',
-            hash_key: 'humanize'
+            method: 'humanize'
     end
   end
 end
diff --git a/app/graphql/types/project_type.rb b/app/graphql/types/project_type.rb
index 0361ccb6c12..203c2568ce2 100644
--- a/app/graphql/types/project_type.rb
+++ b/app/graphql/types/project_type.rb
@@ -24,13 +24,8 @@ module Types
           authorize: :create_pipeline,
           alpha: { milestone: '15.3' },
           description: 'CI/CD config variable.' do
-            argument :sha, GraphQL::Types::String,
-              required: false,
-              description: 'Sha.',
-              deprecated: { reason: 'Use `ref`', milestone: '15.11' }
-
             argument :ref, GraphQL::Types::String,
-              required: false, # Make required when `sha` argument is removed
+              required: true,
               description: 'Ref.'
           end
 
@@ -663,12 +658,8 @@ module Types
       project.container_repositories.size
     end
 
-    # Even if the parameter name is `sha`, it is actually a ref name. We always send `ref` to the endpoint.
-    # See: https://gitlab.com/gitlab-org/gitlab/-/issues/389065
-    # Remove `sha` argument and make `ref` required in a future release
-    # See: https://gitlab.com/gitlab-org/gitlab/-/issues/404493
-    def ci_config_variables(ref: nil, sha: nil)
-      result = ::Ci::ListConfigVariablesService.new(object, context[:current_user]).execute(ref || sha)
+    def ci_config_variables(ref:)
+      result = ::Ci::ListConfigVariablesService.new(object, context[:current_user]).execute(ref)
 
       return if result.nil?