Automatic merge of gitlab-org/gitlab master

.gitlab/ci/rules.gitlab-ci.yml

@@ -621,6 +621,8 @@
     - <<: *if-merge-request-title-run-all-rspec
     - <<: *if-merge-request
       changes: *ci-patterns
+    - <<: *if-merge-request
+      changes: *db-patterns
     - <<: *if-automated-merge-request
       changes: *db-patterns
     - <<: *if-merge-request-not-approved
@@ -640,6 +642,7 @@
       when: never
     - <<: *if-merge-request
       changes: *db-patterns
+      when: never
 
 .rails:rules:ee-and-foss-mr-with-migration:
   rules:
@@ -767,6 +770,8 @@
     - <<: *if-merge-request-title-run-all-rspec
     - <<: *if-merge-request
       changes: *ci-patterns
+    - <<: *if-merge-request
+      changes: *db-patterns
     - <<: *if-automated-merge-request
       changes: *db-patterns
     - <<: *if-merge-request-not-approved
@@ -788,6 +793,7 @@
       when: never
     - <<: *if-merge-request
       changes: *db-patterns
+      when: never
 
 .rails:rules:ee-only-unit:
   rules:
@@ -883,14 +889,14 @@
     - <<: *if-merge-request-title-run-all-rspec
     - <<: *if-merge-request
       changes: *ci-patterns
-    - <<: *if-automated-merge-request
-      changes: *db-patterns
-    - <<: *if-merge-request-not-approved
-      when: never
     - <<: *if-security-merge-request
       changes: *db-patterns
     - <<: *if-merge-request-title-as-if-foss
       changes: *db-patterns
+    - <<: *if-automated-merge-request
+      changes: *db-patterns
+    - <<: *if-merge-request-not-approved
+      when: never
 
 .rails:rules:as-if-foss-migration:minimal:
   rules:
@@ -905,8 +911,10 @@
       when: never
     - <<: *if-security-merge-request
       changes: *db-patterns
+      when: never
     - <<: *if-merge-request-title-as-if-foss
       changes: *db-patterns
+      when: never
 
 .rails:rules:as-if-foss-unit:
   rules:

GITALY_SERVER_VERSION

-bdbed7a8a30246ee83d325615bb43213bf7a1d69
+2ddefee1edfde10092a278a143c48fdcf86e380f

app/models/issue.rb

@@ -586,14 +586,7 @@ class Issue < ApplicationRecord
 
   override :ensure_metrics
   def ensure_metrics
-    return Issue::Metrics.record!(self) if Feature.enabled?(:upsert_issue_metrics, default_enabled: :yaml)
-
-    if !association(:metrics).loaded? || metrics.blank?
-      metrics_record = Issue::Metrics.safe_find_or_create_by(issue: self)
-      self.metrics = metrics_record
-    end
-
-    metrics.record!
+    Issue::Metrics.record!(self)
   end
 
   def record_create_action

app/models/issue/metrics.rb

@@ -35,22 +35,4 @@ class Issue::Metrics < ApplicationRecord
       issue.labels.joins(:lists).exists?
     end
   end
-
-  def record!
-    if issue.milestone_id.present? && self.first_associated_with_milestone_at.blank?
-      self.first_associated_with_milestone_at = Time.current
-    end
-
-    if issue_assigned_to_list_label? && self.first_added_to_board_at.blank?
-      self.first_added_to_board_at = Time.current
-    end
-
-    self.save
-  end
-
-  private
-
-  def issue_assigned_to_list_label?
-    issue.labels.joins(:lists).exists?
-  end
 end

config/feature_flags/development/changes_batch_commits.yml

----
-name: changes_batch_commits
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66731
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336992
-milestone: '14.2'
-type: development
-group: group::gitaly
-default_enabled: false

config/feature_flags/development/upsert_issue_metrics.yml

----
-name: upsert_issue_metrics
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68509
-rollout_issue_url: 
-milestone: '14.3'
-type: development
-group: group::project management
-default_enabled: false

db/post_migrate/20210823193234_remove_allow_editing_commit_messages_from_project_settings.rb

+# frozen_string_literal: true
+
+class RemoveAllowEditingCommitMessagesFromProjectSettings < ActiveRecord::Migration[6.1]
+  include Gitlab::Database::MigrationHelpers
+
+  def up
+    return unless column_exists?(:project_settings, :allow_editing_commit_messages)
+
+    with_lock_retries do
+      remove_column :project_settings, :allow_editing_commit_messages
+    end
+  end
+
+  def down
+    with_lock_retries do
+      add_column :project_settings, :allow_editing_commit_messages, :boolean, default: false, null: false
+    end
+  end
+end

db/schema_migrations/20210823193234

+b85ef326056bb152d527e34b49caa3c40ee8685c3b14654992246c6adf082f8c
\ No newline at end of file

db/structure.sql

@@ -17342,7 +17342,6 @@ CREATE TABLE project_settings (
     squash_option smallint DEFAULT 3,
     has_confluence boolean DEFAULT false NOT NULL,
     has_vulnerabilities boolean DEFAULT false NOT NULL,
-    allow_editing_commit_messages boolean DEFAULT false NOT NULL,
     prevent_merge_without_jira_issue boolean DEFAULT false NOT NULL,
     cve_id_request_enabled boolean DEFAULT true NOT NULL,
     mr_default_target_self boolean DEFAULT false NOT NULL,

ee/app/assets/javascripts/threat_monitoring/components/constants.js

@@ -25,21 +25,22 @@ export { dateFormats as DATE_FORMATS } from '~/analytics/shared/constants';
 export const POLICY_TYPE_COMPONENT_OPTIONS = {
   container: {
     component: 'network-policy-editor',
+    kind: {
+      cilium: 'CiliumNetworkPolicy',
+      network: 'NetworkPolicy',
+    },
     shouldShowEnvironmentPicker: true,
     text: s__('SecurityOrchestration|Network'),
+    typeName: 'NetworkPolicy',
     urlParameter: 'container_policy',
     value: 'container',
-    yamlIndicator: {
-      cilium: 'CiliumNetworkPolicy',
-      network: 'NetworkPolicy',
-    },
   },
   scanExecution: {
     component: 'scan-execution-policy-editor',
     text: s__('SecurityOrchestration|Scan Execution'),
+    typeName: 'ScanExecutionPolicy',
     urlParameter: 'scan_execution_policy',
     value: 'scanExecution',
-    yamlIndicator: 'scanner_profile',
   },
 };
 

ee/app/assets/javascripts/threat_monitoring/components/policies/policies_list.vue

@@ -167,7 +167,8 @@ export default {
       return '';
     },
     policyType() {
-      return this.selectedPolicy ? getPolicyType(this.selectedPolicy.yaml) : 'container';
+      // eslint-disable-next-line no-underscore-dangle
+      return this.selectedPolicy ? getPolicyType(this.selectedPolicy.__typename) : 'container';
     },
     hasExistingPolicies() {
       return !(this.selectedPolicyType === POLICY_TYPE_OPTIONS.ALL.value && !this.policies.length);

ee/app/assets/javascripts/threat_monitoring/components/policy_editor/network_policy/lib/to_yaml.js

@@ -48,7 +48,7 @@ export default function toYaml(policy) {
 
   const policySpec = {
     apiVersion: 'cilium.io/v2',
-    kind: POLICY_TYPE_COMPONENT_OPTIONS.container.yamlIndicator.cilium,
+    kind: POLICY_TYPE_COMPONENT_OPTIONS.container.kind.cilium,
   };
 
   if (description?.length > 0) {

ee/app/assets/javascripts/threat_monitoring/components/policy_list.vue

@@ -168,7 +168,8 @@ export default {
         : '';
     },
     policyType() {
-      return this.selectedPolicy ? getPolicyType(this.selectedPolicy.yaml) : '';
+      // eslint-disable-next-line no-underscore-dangle
+      return this.selectedPolicy ? getPolicyType(this.selectedPolicy.__typename) : '';
     },
     fields() {
       const environments = {

ee/app/assets/javascripts/threat_monitoring/utils.js

 import createGqClient from '~/lib/graphql';
 import { POLICY_TYPE_COMPONENT_OPTIONS } from './components/constants';
 
-/**
- * Determines if the yaml passed in is of the type `container`
- * @param {String} yaml the policy in yaml form
- * @returns {Boolean}
- */
-const isContainerPolicyYaml = (yaml) => {
-  const containerYamlIndicator = Object.values(
-    POLICY_TYPE_COMPONENT_OPTIONS.container.yamlIndicator,
-  );
-  return containerYamlIndicator.some((str) => yaml?.includes(str));
-};
-
 /**
  * Get the height of the wrapper page element
  * This height can be used to determine where the highest element goes in a page
@@ -30,11 +18,11 @@ export const getContentWrapperHeight = (contentWrapperClass) => {
  * @param {String} yaml policy's YAML manifest
  * @returns {String|null} policy type if available
  */
-export const getPolicyType = (yaml = '') => {
-  if (isContainerPolicyYaml(yaml)) {
+export const getPolicyType = (typeName = '') => {
+  if (typeName === POLICY_TYPE_COMPONENT_OPTIONS.container.typeName) {
     return POLICY_TYPE_COMPONENT_OPTIONS.container.value;
   }
-  if (yaml?.includes(POLICY_TYPE_COMPONENT_OPTIONS.scanExecution.yamlIndicator)) {
+  if (typeName === POLICY_TYPE_COMPONENT_OPTIONS.scanExecution.typeName) {
     return POLICY_TYPE_COMPONENT_OPTIONS.scanExecution.value;
   }
   return null;

ee/spec/frontend/threat_monitoring/mocks/mock_data.js

@@ -114,6 +114,7 @@ spec:
     - cluster`;
 
 export const mockCiliumPolicy = {
+  __typename: 'NetworkPolicy',
   name: 'test-policy-03',
   updatedAt: new Date('2021-06-07T00:00:00.000Z'),
   yaml: mockCiliumManifest,
@@ -121,6 +122,7 @@ export const mockCiliumPolicy = {
 
 export const mockNetworkPoliciesResponse = [
   {
+    __typename: 'NetworkPolicy',
     name: 'policy',
     kind: 'NetworkPolicy',
     yaml: mockNetworkManifest,
@@ -132,6 +134,7 @@ export const mockNetworkPoliciesResponse = [
     },
   },
   {
+    __typename: 'NetworkPolicy',
     name: 'test-policy-02',
     kind: 'CiliumNetworkPolicy',
     yaml: mockL3Manifest,
@@ -145,6 +148,7 @@ export const mockNetworkPoliciesResponse = [
 ];
 
 export const mockScanExecutionPolicy = {
+  __typename: 'ScanExecutionPolicy',
   name: 'Scheduled DAST scan',
   updatedAt: new Date('2021-06-07T00:00:00.000Z'),
   yaml: mockDastScanExecutionManifest,

ee/spec/frontend/threat_monitoring/utils_spec.js

+/* eslint-disable no-underscore-dangle */
 import { POLICY_TYPE_COMPONENT_OPTIONS } from 'ee/threat_monitoring/components/constants';
 import {
   getContentWrapperHeight,
@@ -5,11 +6,7 @@ import {
   removeUnnecessaryDashes,
 } from 'ee/threat_monitoring/utils';
 import { setHTMLFixture } from 'helpers/fixtures';
-import {
-  mockDastScanExecutionManifest,
-  mockCiliumManifest,
-  mockNetworkManifest,
-} from './mocks/mock_data';
+import { mockScanExecutionPolicy, mockNetworkPoliciesResponse } from './mocks/mock_data';
 
 describe('Threat Monitoring Utils', () => {
   describe('getContentWrapperHeight', () => {
@@ -36,12 +33,12 @@ describe('Threat Monitoring Utils', () => {
 
   describe('getPolicyType', () => {
     it.each`
-      input                            | output
-      ${''}                            | ${null}
-      ${'random string'}               | ${null}
-      ${mockNetworkManifest}           | ${POLICY_TYPE_COMPONENT_OPTIONS.container.value}
-      ${mockCiliumManifest}            | ${POLICY_TYPE_COMPONENT_OPTIONS.container.value}
-      ${mockDastScanExecutionManifest} | ${POLICY_TYPE_COMPONENT_OPTIONS.scanExecution.value}
+      input                                        | output
+      ${''}                                        | ${null}
+      ${'UnknownPolicyType'}                       | ${null}
+      ${mockNetworkPoliciesResponse[0].__typename} | ${POLICY_TYPE_COMPONENT_OPTIONS.container.value}
+      ${mockNetworkPoliciesResponse[1].__typename} | ${POLICY_TYPE_COMPONENT_OPTIONS.container.value}
+      ${mockScanExecutionPolicy.__typename}        | ${POLICY_TYPE_COMPONENT_OPTIONS.scanExecution.value}
     `('returns $output when used on $input', ({ input, output }) => {
       expect(getPolicyType(input)).toBe(output);
     });

lib/gitlab/checks/changes_access.rb

@@ -81,7 +81,7 @@ module Gitlab
       def single_access_checks!
         # Iterate over all changes to find if user allowed all of them to be applied
         changes.each do |change|
-          commits = Gitlab::Lazy.new { commits_for(change[:newrev]) } if Feature.enabled?(:changes_batch_commits)
+          commits = Gitlab::Lazy.new { commits_for(change[:newrev]) }
 
           # If user does not have access to make at least one change, cancel all
           # push by allowing the exception to bubble up

spec/lib/gitlab/checks/changes_access_spec.rb

@@ -8,53 +8,35 @@ RSpec.describe Gitlab::Checks::ChangesAccess do
   subject { changes_access }
 
   describe '#validate!' do
-    shared_examples '#validate!' do
-      before do
-        allow(project).to receive(:lfs_enabled?).and_return(true)
-      end
-
-      context 'without failed checks' do
-        it "doesn't raise an error" do
-          expect { subject.validate! }.not_to raise_error
-        end
-
-        it 'calls lfs checks' do
-          expect_next_instance_of(Gitlab::Checks::LfsCheck) do |instance|
-            expect(instance).to receive(:validate!)
-          end
+    before do
+      allow(project).to receive(:lfs_enabled?).and_return(true)
+    end
 
-          subject.validate!
-        end
+    context 'without failed checks' do
+      it "doesn't raise an error" do
+        expect { subject.validate! }.not_to raise_error
       end
 
-      context 'when time limit was reached' do
-        it 'raises a TimeoutError' do
-          logger = Gitlab::Checks::TimedLogger.new(start_time: timeout.ago, timeout: timeout)
-          access = described_class.new(changes,
-                                       project: project,
-                                       user_access: user_access,
-                                       protocol: protocol,
-                                       logger: logger)
-
-          expect { access.validate! }.to raise_error(Gitlab::Checks::TimedLogger::TimeoutError)
+      it 'calls lfs checks' do
+        expect_next_instance_of(Gitlab::Checks::LfsCheck) do |instance|
+          expect(instance).to receive(:validate!)
         end
-      end
-    end
 
-    context 'with batched commits enabled' do
-      before do
-        stub_feature_flags(changes_batch_commits: true)
+        subject.validate!
       end
-
-      it_behaves_like '#validate!'
     end
 
-    context 'with batched commits disabled' do
-      before do
-        stub_feature_flags(changes_batch_commits: false)
-      end
+    context 'when time limit was reached' do
+      it 'raises a TimeoutError' do
+        logger = Gitlab::Checks::TimedLogger.new(start_time: timeout.ago, timeout: timeout)
+        access = described_class.new(changes,
+                                     project: project,
+                                     user_access: user_access,
+                                     protocol: protocol,
+                                     logger: logger)
 
-      it_behaves_like '#validate!'
+        expect { access.validate! }.to raise_error(Gitlab::Checks::TimedLogger::TimeoutError)
+      end
     end
   end
 

spec/models/issue/metrics_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe Issue::Metrics do
     end
   end
 
-  shared_examples "when recording the default set of issue metrics on issue save" do
+  context "when recording the default set of issue metrics on issue save" do
     context "milestones" do
       it "records the first time an issue is associated with a milestone" do
         time = Time.current
@@ -81,20 +81,4 @@ RSpec.describe Issue::Metrics do
       end
     end
   end
-
-  context 'when upsert_issue_metrics is enabled' do
-    before do
-      stub_feature_flags(upsert_issue_metrics: true)
-    end
-
-    it_behaves_like 'when recording the default set of issue metrics on issue save'
-  end
-
-  context 'when upsert_issue_metrics is disabled' do
-    before do
-      stub_feature_flags(upsert_issue_metrics: false)
-    end
-
-    it_behaves_like 'when recording the default set of issue metrics on issue save'
-  end
 end