Automatic merge of gitlab-org/gitlab master

app/views/admin/appearances/_form.html.haml

@@ -101,7 +101,7 @@
             = parsed_with_gfm
 
       .gl-mt-3.gl-mb-3
-        = f.submit 'Update appearance settings', class: 'btn gl-button btn-success'
+        = f.submit 'Update appearance settings', class: 'btn gl-button btn-confirm'
         - if @appearance.persisted? || @appearance.updated_at
           .mt-4
             - if @appearance.persisted?

app/views/admin/appearances/preview_sign_in.html.haml

@@ -8,5 +8,5 @@
       = label_tag :password
       = password_field_tag :password, nil, class: "form-control gl-form-input bottom", title: 'This field is required.'
     .form-group
-      = button_tag "Sign in", class: "btn gl-button btn-success"
+      = button_tag "Sign in", class: "btn gl-button btn-confirm"
 

changelogs/unreleased/btn-confirm-admin-appearances.yml

+---
+title: Move to btn-confirm from btn-success in admin/appearances directory
+merge_request: 55264
+author: Yogi (@yo)
+type: changed

changelogs/unreleased/remove-index-add-index.yml

+---
+title: Remove unique index and add composite key index to Security Orchestration
+merge_request: 55521
+author:
+type: other

changelogs/unreleased/rename-vuln-fingerprint-indexes.yml

+---
+title: Rename vulnerability fingerprints indexes
+merge_request: 55552
+author:
+type: other

db/migrate/20210302155904_remove_index_for_security_orchestration_policy.rb

+# frozen_string_literal: true
+
+class RemoveIndexForSecurityOrchestrationPolicy < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_sop_configs_on_security_policy_management_project_id'
+
+  disable_ddl_transaction!
+
+  def up
+    remove_concurrent_index_by_name(:security_orchestration_policy_configurations, INDEX_NAME)
+  end
+
+  def down
+    add_concurrent_index(:security_orchestration_policy_configurations, :security_policy_management_project_id, name: INDEX_NAME)
+  end
+end

db/migrate/20210302160544_add_index_to_security_orchestration_policy.rb

+# frozen_string_literal: true
+
+class AddIndexToSecurityOrchestrationPolicy < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX = 'index_sop_configurations_project_id_policy_project_id'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :security_orchestration_policy_configurations, [:security_policy_management_project_id, :project_id], name: INDEX
+  end
+
+  def down
+    remove_concurrent_index_by_name :security_orchestration_policy_configurations, INDEX
+  end
+end

db/migrate/20210302212623_rename_vuln_fingerprints_indexes.rb

+# frozen_string_literal: true
+
+class RenameVulnFingerprintsIndexes < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  FINGERPRINT_IDX = :idx_vuln_fingerprints_on_occurrences_id_and_fingerprint
+  FINGERPRINT_IDX_RENAMED = :idx_vuln_fingerprints_on_occurrences_id_and_fingerprint_sha256
+  UNIQ_IDX = :idx_vuln_fingerprints_uniqueness
+  UNIQ_IDX_RENAMED = :idx_vuln_fingerprints_uniqueness_fingerprint_sha256
+
+  disable_ddl_transaction!
+
+  def up
+    # These `unless` checks are necessary for re-running the migrations multiple times
+    unless index_exists_by_name?(:vulnerability_finding_fingerprints, FINGERPRINT_IDX_RENAMED)
+      rename_index :vulnerability_finding_fingerprints, FINGERPRINT_IDX, FINGERPRINT_IDX_RENAMED
+    end
+
+    unless index_exists_by_name?(:vulnerability_finding_fingerprints, UNIQ_IDX_RENAMED)
+      rename_index :vulnerability_finding_fingerprints, UNIQ_IDX, UNIQ_IDX_RENAMED
+    end
+  end
+
+  def down
+    unless index_exists_by_name?(:vulnerability_finding_fingerprints, FINGERPRINT_IDX)
+      rename_index :vulnerability_finding_fingerprints, FINGERPRINT_IDX_RENAMED, FINGERPRINT_IDX
+    end
+
+    unless index_exists_by_name?(:vulnerability_finding_fingerprints, UNIQ_IDX)
+      rename_index :vulnerability_finding_fingerprints, UNIQ_IDX_RENAMED, UNIQ_IDX
+    end
+  end
+end

db/schema_migrations/20210302155904

+104e767518d55a7caa5ff517efe978287beb629649c681a2871ada8a677a0e13
\ No newline at end of file

db/schema_migrations/20210302160544

+e5c589decb2bc8d3e37451bf9977a810308ee37f5f02ed96226e0be87f8b908d
\ No newline at end of file

db/schema_migrations/20210302212623

+283645d1791a8d72fa7e327799ede933d89bd69d8db2a87b7ff437a2f5d74da3
\ No newline at end of file

db/structure.sql

@@ -21483,9 +21483,9 @@ CREATE INDEX idx_security_scans_on_scan_type ON security_scans USING btree (scan
 
 CREATE UNIQUE INDEX idx_serverless_domain_cluster_on_clusters_applications_knative ON serverless_domain_cluster USING btree (clusters_applications_knative_id);
 
-CREATE UNIQUE INDEX idx_vuln_fingerprints_on_occurrences_id_and_fingerprint ON vulnerability_finding_fingerprints USING btree (finding_id, fingerprint_sha256);
+CREATE UNIQUE INDEX idx_vuln_fingerprints_on_occurrences_id_and_fingerprint_sha256 ON vulnerability_finding_fingerprints USING btree (finding_id, fingerprint_sha256);
 
-CREATE UNIQUE INDEX idx_vuln_fingerprints_uniqueness ON vulnerability_finding_fingerprints USING btree (finding_id, algorithm_type, fingerprint_sha256);
+CREATE UNIQUE INDEX idx_vuln_fingerprints_uniqueness_fingerprint_sha256 ON vulnerability_finding_fingerprints USING btree (finding_id, algorithm_type, fingerprint_sha256);
 
 CREATE UNIQUE INDEX idx_vulnerability_ext_issue_links_on_vulne_id_and_ext_issue ON vulnerability_external_issue_links USING btree (vulnerability_id, external_type, external_project_key, external_issue_key);
 
@@ -23563,7 +23563,7 @@ CREATE UNIQUE INDEX index_software_licenses_on_unique_name ON software_licenses
 
 CREATE UNIQUE INDEX index_sop_configs_on_project_id ON security_orchestration_policy_configurations USING btree (project_id);
 
-CREATE UNIQUE INDEX index_sop_configs_on_security_policy_management_project_id ON security_orchestration_policy_configurations USING btree (security_policy_management_project_id);
+CREATE INDEX index_sop_configurations_project_id_policy_project_id ON security_orchestration_policy_configurations USING btree (security_policy_management_project_id, project_id);
 
 CREATE INDEX index_sprints_iterations_cadence_id ON sprints USING btree (iterations_cadence_id);
 

doc/administration/packages/container_registry.md

@@ -900,12 +900,12 @@ not directly accessible via `tag`:
 sudo gitlab-ctl registry-garbage-collect -m
 ```
 
-Without the `-m` flag, the Container Registry only removes layers that are not referenced by any manifest, tagged or not.
-
 Since this is a way more destructive operation, this behavior is disabled by default.
 You are likely expecting this way of operation, but before doing that, ensure
 that you have backed up all registry data.
 
+When the command is used without the `-m` flag, the Container Registry only removes layers that are not referenced by any manifest, tagged or not.
+
 ### Performing garbage collection without downtime
 
 > [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/764) in GitLab 8.8.