Merge branch 'master' into 'master'

Changed confidential quick action to only be available on non confidential issues

See merge request gitlab-org/gitlab!16902

changelogs/unreleased/66330-confidential-quick-action-is-available-for-confidential-issues.yml

+---
+title: Changed confidential quick action to only be available on non confidential issues
+merge_request: 16902
+author: Marc Schwede
+type: fixed

lib/gitlab/quick_actions/issue_actions.rb

@@ -135,7 +135,8 @@ module Gitlab
         end
         types Issue
         condition do
-          current_user.can?(:"admin_#{quick_action_target.to_ability_name}", quick_action_target)
+          !quick_action_target.confidential? &&
+            current_user.can?(:"admin_#{quick_action_target.to_ability_name}", quick_action_target)
         end
         command :confidential do
           @updates[:confidential] = true

spec/services/quick_actions/interpret_service_spec.rb

@@ -586,6 +586,22 @@ describe QuickActions::InterpretService do
 
         expect(message).to eq('Made this issue confidential.')
       end
+
+      context 'when issuable is already confidential' do
+        before do
+          issuable.update(confidential: true)
+        end
+
+        it 'does not return the success message' do
+          _, _, message = service.execute(content, issuable)
+
+          expect(message).to be_empty
+        end
+
+        it 'is not part of the available commands' do
+          expect(service.available_commands(issuable)).not_to include(a_hash_including(name: :confidential))
+        end
+      end
     end
 
     shared_examples 'shrug command' do