Automatic merge of gitlab-org/gitlab master

app/models/concerns/issue_available_features.rb

@@ -10,7 +10,8 @@ module IssueAvailableFeatures
     # EE only features are listed on EE::IssueAvailableFeatures
     def available_features_for_issue_types
       {
-        assignee: %w(issue incident)
+        assignee: %w(issue incident),
+        confidentiality: %(issue incident)
       }.with_indifferent_access
     end
   end

changelogs/unreleased/ab-drop-tmp-index.yml

+---
+title: Drop temporary index on ci_builds
+merge_request: 50961
+author:
+type: other

db/migrate/20210102164121_drop_temporary_index_on_ci_builds.rb

+# frozen_string_literal: true
+
+class DropTemporaryIndexOnCiBuilds < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  INDEX = 'tmp_build_stage_position_index'.freeze
+
+  def up
+    remove_concurrent_index_by_name :ci_builds, INDEX
+  end
+
+  def down
+    add_concurrent_index :ci_builds, [:stage_id, :stage_idx], where: 'stage_idx IS NOT NULL', name: INDEX
+  end
+end

db/schema_migrations/20210102164121

+d15dc3e57f050f037dd6b6b2b1efdafee49bf411580e35a7b4dbe14868c41e13
\ No newline at end of file

db/structure.sql

@@ -23105,8 +23105,6 @@ CREATE INDEX temporary_index_vulnerabilities_on_id ON vulnerabilities USING btre
 
 CREATE UNIQUE INDEX term_agreements_unique_index ON term_agreements USING btree (user_id, term_id);
 
-CREATE INDEX tmp_build_stage_position_index ON ci_builds USING btree (stage_id, stage_idx) WHERE (stage_idx IS NOT NULL);
-
 CREATE INDEX tmp_index_for_email_unconfirmation_migration ON emails USING btree (id) WHERE (confirmed_at IS NOT NULL);
 
 CREATE INDEX tmp_index_oauth_applications_on_id_where_trusted ON oauth_applications USING btree (id) WHERE (trusted = true);

doc/architecture/blueprints/cloud_native_gitlab_pages/index.md

@@ -121,9 +121,9 @@ DRIs:
 
 | Role                         | Who
 |------------------------------|------------------------|
-| Product                      |    Jackie Porter       |
+| Product                      |    Orit Golowinski       |
 | Leadership                   |    Daniel Croft        |
-| Engineering                  |    Kamil Trzciński     |
+| Engineering                  |    Vladimir Shushlin   |
 
 Domain Experts:
 

doc/user/admin_area/license.md

@@ -53,10 +53,10 @@ Otherwise, you can:
      ![Upload license](img/license_upload_v13_8.png)
 
    - *If you've received your license as plain text:*
-    1. Select **Enter license key**.
-    1. Copy the license and paste it into the **License key** field.
-    1. Check the **Subscription Agreement** checkbox.
-    1. Select **Upload License**.
+     1. Select **Enter license key**.
+     1. Copy the license and paste it into the **License key** field.
+     1. Check the **Subscription Agreement** checkbox.
+     1. Select **Upload License**.
 
 ## Add your license at install time
 

doc/user/infrastructure/mr_integration.md

@@ -72,10 +72,10 @@ To manually configure a GitLab Terraform Report artifact requires the following
          terraform: $PLAN_JSON
    ```
 
-   For a full example using the pre-built image, see [Example `.gitlab-ci.yaml`
-   file](#example-gitlab-ciyaml-file).
+   For a full example using the pre-built image, see [Example `.gitlab-ci.yml`
+   file](#example-gitlab-ciyml-file).
 
-   For an example displaying multiple reports, see [`.gitlab-ci.yaml` multiple reports file](#multiple-terraform-plan-reports).
+   For an example displaying multiple reports, see [`.gitlab-ci.yml` multiple reports file](#multiple-terraform-plan-reports).
 
 1. Running the pipeline displays the widget in the merge request, like this:
 
@@ -86,7 +86,7 @@ To manually configure a GitLab Terraform Report artifact requires the following
 
    ![Terraform plan logs](img/terraform_plan_log_v13_0.png)
 
-### Example `.gitlab-ci.yaml` file
+### Example `.gitlab-ci.yml` file
 
 ```yaml
 default:

doc/user/project/releases/index.md

@@ -200,7 +200,7 @@ If the job that's executing is within a freeze period, GitLab CI/CD creates an e
 variable named `$CI_DEPLOY_FREEZE`.
 
 To prevent the deployment job from executing, create a `rules` entry in your
-`gitlab-ci.yaml`, for example:
+`gitlab-ci.yml`, for example:
 
 ```yaml
 deploy_to_production:

ee/changelogs/unreleased/issue_270585-block_confidential_quick_action.yml

+---
+title: Block confidential quick action for test cases
+merge_request: 50460
+author:
+type: other

ee/spec/services/quick_actions/interpret_service_spec.rb

@@ -989,6 +989,18 @@ RSpec.describe QuickActions::InterpretService do
         let(:issuable) { build(:merge_request, source_project: project) }
       end
     end
+
+    context 'confidential command' do
+      context 'for test cases' do
+        it 'does not mark to update confidential attribute' do
+          issuable = create(:quality_test_case, project: project)
+
+          _, updates, _ = service.execute('/confidential', issuable)
+
+          expect(updates[:confidential]).to eq(nil)
+        end
+      end
+    end
   end
 
   describe '#explain' do

lib/gitlab/quick_actions/issue_actions.rb

@@ -170,7 +170,8 @@ module Gitlab
         end
         types Issue
         condition do
-          !quick_action_target.confidential? &&
+          quick_action_target.issue_type_supports?(:confidentiality) &&
+            !quick_action_target.confidential? &&
             current_user.can?(:"admin_#{quick_action_target.to_ability_name}", quick_action_target)
         end
         command :confidential do

spec/services/quick_actions/interpret_service_spec.rb

@@ -1142,6 +1142,11 @@ RSpec.describe QuickActions::InterpretService do
       let(:issuable) { issue }
     end
 
+    it_behaves_like 'confidential command' do
+      let(:content) { '/confidential' }
+      let(:issuable) { create(:incident, project: project) }
+    end
+
     it_behaves_like 'lock command' do
       let(:content) { '/lock' }
       let(:issuable) { issue }