Add latest changes from gitlab-org/gitlab@master

3 files changed, 26 insertions, 19 deletions

diff --git a/lib/api/tags.rb b/lib/api/tags.rb
index 97a2aebf53b..c8ac68189f5 100644
--- a/lib/api/tags.rb
+++ b/lib/api/tags.rb
@@ -22,8 +22,8 @@ module API
       params do
         optional :sort, type: String, values: %w[asc desc], default: 'desc',
                         desc: 'Return tags sorted in updated by `asc` or `desc` order.'
-        optional :order_by, type: String, values: %w[name updated], default: 'updated',
-                            desc: 'Return tags ordered by `name` or `updated` fields.'
+        optional :order_by, type: String, values: %w[name updated version], default: 'updated',
+                            desc: 'Return tags ordered by `name`, `updated`, `version` fields.'
         optional :search, type: String, desc: 'Return list of tags matching the search criteria'
         optional :page_token, type: String, desc: 'Name of tag to start the paginaition from'
         use :pagination
diff --git a/lib/gitlab/quick_actions/merge_request_actions.rb b/lib/gitlab/quick_actions/merge_request_actions.rb
index 3cb01db1491..d38b81bff0b 100644
--- a/lib/gitlab/quick_actions/merge_request_actions.rb
+++ b/lib/gitlab/quick_actions/merge_request_actions.rb
@@ -88,33 +88,21 @@ module Gitlab
           @execution_message[:rebase] = _('Scheduled a rebase of branch %{branch}.') % { branch: branch }
         end
 
-        desc { _('Toggle the Draft status') }
+        desc { _('Set the Draft status') }
         explanation do
-          noun = quick_action_target.to_ability_name.humanize(capitalize: false)
-          if quick_action_target.draft?
-            _("Marks this %{noun} as ready.")
-          else
-            _("Marks this %{noun} as a draft.")
-          end % { noun: noun }
+          draft_action_message(_("Marks"))
         end
         execution_message do
-          noun = quick_action_target.to_ability_name.humanize(capitalize: false)
-          if quick_action_target.draft?
-            _("Marked this %{noun} as ready.")
-          else
-            _("Marked this %{noun} as a draft.")
-          end % { noun: noun }
+          draft_action_message(_("Marked"))
         end
 
         types MergeRequest
         condition do
           quick_action_target.respond_to?(:draft?) &&
-            # Allow it to mark as draft on MR creation page or through MR notes
-            #
             (quick_action_target.new_record? || current_user.can?(:"update_#{quick_action_target.to_ability_name}", quick_action_target))
         end
         command :draft do
-          @updates[:wip_event] = quick_action_target.draft? ? 'ready' : 'draft'
+          @updates[:wip_event] = draft_action_command
         end
 
         desc { _('Set the Ready status') }
@@ -317,6 +305,25 @@ module Gitlab
         end
       end
 
+      def draft_action_message(verb)
+        noun = quick_action_target.to_ability_name.humanize(capitalize: false)
+        if !quick_action_target.draft?
+          _("%{verb} this %{noun} as a draft.")
+        elsif Feature.disabled?(:draft_quick_action_non_toggle, quick_action_target.project)
+          _("%{verb} this %{noun} as ready.")
+        else
+          _("No change to this %{noun}'s draft status.")
+        end % { verb: verb, noun: noun }
+      end
+
+      def draft_action_command
+        if Feature.disabled?(:draft_quick_action_non_toggle, quick_action_target.project)
+          quick_action_target.draft? ? 'ready' : 'draft'
+        else
+          'draft'
+        end
+      end
+
       def merge_orchestration_service
         @merge_orchestration_service ||= ::MergeRequests::MergeOrchestrationService.new(project, current_user)
       end
diff --git a/lib/google_api/cloud_platform/client.rb b/lib/google_api/cloud_platform/client.rb
index 39cf994ca3f..38a1a968aec 100644
--- a/lib/google_api/cloud_platform/client.rb
+++ b/lib/google_api/cloud_platform/client.rb
@@ -22,7 +22,7 @@ module GoogleApi
         "https://www.googleapis.com/auth/logging.write",
         "https://www.googleapis.com/auth/monitoring"
       ].freeze
-      ROLES_LIST = %w[roles/iam.serviceAccountUser roles/artifactregistry.admin roles/cloudbuild.builds.builder roles/run.admin roles/storage.admin roles/cloudsql.admin roles/browser].freeze
+      ROLES_LIST = %w[roles/iam.serviceAccountUser roles/artifactregistry.admin roles/cloudbuild.builds.builder roles/run.admin roles/storage.admin roles/cloudsql.client roles/browser].freeze
       REVOKE_URL = 'https://oauth2.googleapis.com/revoke'
 
       class << self