app/models/clusters/applications/runner.rb

@@ -3,7 +3,7 @@
 module Clusters
   module Applications
     class Runner < ApplicationRecord
-      VERSION = '0.30.0'
+      VERSION = '0.31.0'
 
       self.table_name = 'clusters_applications_runners'
 

app/models/concerns/ci/metadatable.rb

@@ -76,14 +76,8 @@ def read_metadata_attribute(legacy_key, metadata_key, default_value = nil)
     end
 
     def write_metadata_attribute(legacy_key, metadata_key, value)
-      # save to metadata or this model depending on the state of feature flag
-      if Feature.enabled?(:ci_build_metadata_config, project, default_enabled: :yaml)
-        ensure_metadata.write_attribute(metadata_key, value)
-        write_attribute(legacy_key, nil)
-      else
-        write_attribute(legacy_key, value)
-        metadata&.write_attribute(metadata_key, nil)
-      end
+      ensure_metadata.write_attribute(metadata_key, value)
+      write_attribute(legacy_key, nil)
     end
   end
 end

app/services/projects/overwrite_project_service.rb

@@ -5,6 +5,8 @@ class OverwriteProjectService < BaseService
     def execute(source_project)
       return unless source_project && source_project.namespace == @project.namespace
 
+      start_time = ::Gitlab::Metrics::System.monotonic_time
+
       Project.transaction do
         move_before_destroy_relationships(source_project)
         # Reset is required in order to get the proper
@@ -25,10 +27,25 @@ def execute(source_project)
       else
         raise
       end
+
+    ensure
+      track_service(start_time, source_project, e)
     end
 
     private
 
+    def track_service(start_time, source_project, exception)
+      return if ::Feature.disabled?(:project_overwrite_service_tracking, source_project, default_enabled: :yaml)
+
+      duration = ::Gitlab::Metrics::System.monotonic_time - start_time
+
+      Gitlab::AppJsonLogger.info(class: self.class.name,
+                                 namespace_id: source_project.namespace.id,
+                                 project_id: source_project.id,
+                                 duration_s: duration.to_f,
+                                 error: exception.class.name)
+    end
+
     def move_before_destroy_relationships(source_project)
       options = { remove_remaining_elements: false }
 

app/views/admin/application_settings/_kroki.html.haml

@@ -6,7 +6,8 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = _('Allow rendering of diagrams in AsciiDoc and Markdown documents using %{link}.').html_safe % { link: link_to('Kroki', 'https://kroki.io', target: '_blank') }
+      = _('Users can render diagrams in AsciiDoc, Markdown, reStructuredText, and Textile documents using Kroki.')
+      = link_to _('Learn more.'), help_page_path('administration/integration/kroki.md'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
     = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-kroki-settings'), html: { class: 'fieldset-form', id: 'kroki-settings' } do |f|
       = form_errors(@application_setting) if expanded
@@ -20,11 +21,15 @@
           = f.label :kroki_url, 'Kroki URL', class: 'label-bold'
           = f.text_field :kroki_url, class: 'form-control gl-form-input', placeholder: 'http://your-kroki-instance:8000'
           .form-text.text-muted
-            = (_('When Kroki is enabled, GitLab sends diagrams to an instance of Kroki to display them as images. You can use the free public cloud instance %{kroki_public_url} or you can %{install_link} on your own infrastructure. Once you\'ve installed Kroki, make sure to update the server URL to point to your instance.') % { kroki_public_url: '<code>https://kroki.io</code>', install_link: link_to('install Kroki', 'https://docs.kroki.io/kroki/setup/install/', target: '_blank') }).html_safe
+            - install_link_url = 'https://docs.kroki.io/kroki/setup/install/'
+            - install_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: install_link_url }
+            = html_escape(_('Use the public cloud instance URL (%{kroki_public_url}) or %{install_link_start}install Kroki%{install_link_end} on your own infrastructure and use your own instance URL.')) % { kroki_public_url: '<code>https://kroki.io</code>'.html_safe, install_link_start: install_link_start, install_link_end: '</a>'.html_safe }
         .form-group
           = f.label :kroki_formats, 'Additional diagram formats', class: 'label-bold'
           .form-text.text-muted
-            = (_('Using additional formats requires starting the companion containers. Make sure that all %{kroki_images} are running.') % { kroki_images: link_to('required containers', 'https://docs.kroki.io/kroki/setup/install/#_images', target: '_blank') }).html_safe
+            - container_link_url = 'https://docs.kroki.io/kroki/setup/install/#images'
+            - container_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: container_link_url }
+            = html_escape(_('To use the additional formats, you must start the required %{container_link_start}companion containers%{container_link_end}.')) % { container_link_start: container_link_start, container_link_end: '</a>'.html_safe }
           - kroki_available_formats.each do |format|
             .form-check
               = f.check_box format[:name], class: 'form-check-input'

app/views/devise/shared/_email_opted_in.html.haml

-- is_hidden = local_assigns.fetch(:hidden, Gitlab.dev_env_or_com?)
+- return unless Gitlab.dev_env_or_com?
 
-.gl-mb-3.js-email-opt-in{ class: is_hidden ? 'hidden' : '' }
+.gl-mb-3.js-email-opt-in.hidden
   .gl-font-weight-bold.gl-mb-3
     = _('Email updates (optional)')
   = f.check_box :email_opted_in

app/views/jira_connect/subscriptions/index.html.haml

@@ -24,9 +24,10 @@
 
   %p.jira-connect-app-body.gl-px-5.gl-mt-7.gl-font-base.gl-text-center
     %strong= s_('Integrations|Browser limitations')
-    - firefox_link_url = 'https://www.mozilla.org/en-US/firefox/'
-    - firefox_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: firefox_link_url }
-    = s_('Integrations|Adding a namespace works only in browsers that allow cross‑site cookies. Use %{firefox_link_start}Firefox%{firefox_link_end}, or enable cross‑site cookies in your browser, when adding a namespace.').html_safe % { firefox_link_start: firefox_link_start, firefox_link_end: '</a>'.html_safe }
+    - browser_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'
+    - firefox_link_start = browser_link_start.html_safe % { url: 'https://www.mozilla.org/en-US/firefox/' }
+    - chrome_link_start = browser_link_start.html_safe % { url: 'https://www.google.com/chrome/' }
+    = s_('Integrations|Adding a namespace works only in browsers that allow cross‑site cookies. Use %{firefox_link_start}Firefox%{link_end}, %{chrome_link_start}Google Chrome%{link_end}, or enable cross‑site cookies in your browser, when adding a namespace.').html_safe % { firefox_link_start: firefox_link_start, chrome_link_start: chrome_link_start, link_end: '</a>'.html_safe }
     = link_to _('Learn more'), 'https://gitlab.com/gitlab-org/gitlab/-/issues/284211', target: '_blank', rel: 'noopener noreferrer'
 
 = webpack_bundle_tag 'performance_bar' if performance_bar_enabled?

config.ru

@@ -9,6 +9,12 @@ def master_process?
 end
 
 warmup do |app|
+  # The following is necessary to ensure stale Prometheus metrics don't accumulate over time.
+  # It needs to be done as early as here to ensure metrics files aren't deleted.
+  # After we hit our app in `warmup`, first metrics and corresponding files already being created,
+  # for example in `lib/gitlab/metrics/requests_rack_middleware.rb`.
+  Prometheus::CleanupMultiprocDirService.new.execute if master_process?
+
   client = Rack::MockRequest.new(app)
   client.get('/')
 end

config/feature_flags/development/ci_build_metadata_config.yml

----
-name: ci_build_metadata_config
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/7238
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330954
-milestone: '11.7'
-type: development
-group: group::pipeline execution
-default_enabled: false

config/feature_flags/development/graphql_board_lists.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/248908
 milestone: '13.4'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true

config/feature_flags/development/prevent_retry_of_retried_jobs.yml

----
-name: prevent_retry_of_retried_jobs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62349
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331695
-milestone: '14.0'
-type: development
-group: group::pipeline execution
-default_enabled: true

config/feature_flags/development/project_overwrite_service_tracking.yml

+---
+name: project_overwrite_service_tracking
+introduced_by_url:
+rollout_issue_url:
+milestone: '14.1'
+type: development
+group: group::pipeline execution
+default_enabled: false

config/initializers/7_prometheus_metrics.rb

@@ -40,9 +40,6 @@ def prometheus_default_multiproc_dir
   # When running Puma in a Single mode, `on_master_start` and `on_worker_start` are the same.
   # Thus, we order these events to run `reinitialize_on_pid_change` with `force: true` first.
   Gitlab::Cluster::LifecycleEvents.on_master_start do
-    # Ensure that stale Prometheus metrics don't accumulate over time
-    ::Prometheus::CleanupMultiprocDirService.new.execute
-
     ::Prometheus::Client.reinitialize_on_pid_change(force: true)
 
     if Gitlab::Runtime.puma?

config/webpack.config.js

@@ -126,7 +126,7 @@ function generateEntries() {
     default: defaultEntries,
     sentry: './sentry/index.js',
     performance_bar: './performance_bar/index.js',
-    jira_connect_app: './jira_connect/index.js',
+    jira_connect_app: './jira_connect/subscriptions/index.js',
   };
 
   return Object.assign(manualEntries, incrementalCompiler.filterEntryPoints(autoEntries));

db/migrate/20210708202548_add_scanners_column_to_approval_project_rules.rb

+# frozen_string_literal: true
+
+class AddScannersColumnToApprovalProjectRules < ActiveRecord::Migration[6.1]
+  def up
+    add_column :approval_project_rules, :scanners, :text, array: true
+  end
+
+  def down
+    remove_column :approval_project_rules, :scanners
+  end
+end

db/post_migrate/20210706142819_re_schedule_latest_pipeline_id_population.rb

 # frozen_string_literal: true
 
 class ReScheduleLatestPipelineIdPopulation < ActiveRecord::Migration[6.1]
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-  DELAY_INTERVAL = 2.minutes.to_i
-  BATCH_SIZE = 100
-  MIGRATION = 'PopulateLatestPipelineIds'
-
-  disable_ddl_transaction!
-
-  def up
-    return unless Gitlab.ee?
-
-    queue_background_migration_jobs_by_range_at_intervals(
-      Gitlab::BackgroundMigration::PopulateLatestPipelineIds::ProjectSetting.has_vulnerabilities_without_latest_pipeline_set,
-      MIGRATION,
-      DELAY_INTERVAL,
-      batch_size: BATCH_SIZE,
-      primary_column_name: 'project_id'
-    )
-  end
-
-  def down
-    # no-op
+  def change
+    # no-op: This migration has been marked as no-op and replaced by
+    # `ReScheduleLatestPipelineIdPopulationWithLogging` as we've found some problems.
+    # For more information: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66050
   end
 end

db/post_migrate/20210713075117_re_schedule_latest_pipeline_id_population_with_logging.rb

+# frozen_string_literal: true
+
+class ReScheduleLatestPipelineIdPopulationWithLogging < ActiveRecord::Migration[6.1]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  DELAY_INTERVAL = 2.minutes.to_i
+  BATCH_SIZE = 100
+  MIGRATION = 'PopulateLatestPipelineIds'
+
+  disable_ddl_transaction!
+
+  def up
+    return unless Gitlab.ee?
+
+    Gitlab::BackgroundMigration.steal(MIGRATION)
+
+    queue_background_migration_jobs_by_range_at_intervals(
+      Gitlab::BackgroundMigration::PopulateLatestPipelineIds::ProjectSetting.has_vulnerabilities_without_latest_pipeline_set,
+      MIGRATION,
+      DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      primary_column_name: 'project_id'
+    )
+  end
+
+  def down
+    # no-op
+  end
+end

db/schema_migrations/20210708202548

+e2d7e54330f586bf31d953455b2ebac1fc9b6b24058a1cc7b277bc819ebf232a
\ No newline at end of file

db/schema_migrations/20210713075117

+9a8cbcf6ddbdd4379320ed747faed9beb0c2104eb89e61b349432b1f0346a4b5
\ No newline at end of file

db/structure.sql

@@ -9669,7 +9669,8 @@ CREATE TABLE approval_project_rules (
     project_id integer NOT NULL,
     approvals_required smallint DEFAULT 0 NOT NULL,
     name character varying NOT NULL,
-    rule_type smallint DEFAULT 0 NOT NULL
+    rule_type smallint DEFAULT 0 NOT NULL,
+    scanners text[]
 );
 CREATE TABLE approval_project_rules_groups (

doc/.vale/gitlab/spelling-exceptions.txt

@@ -128,6 +128,7 @@ CrowdIn
 CSV
 cybersecurity
 Dangerfile
+Datadog
 datasource
 datasources
 datetime
@@ -686,6 +687,7 @@ unary
 unassign
 unassigning
 unassigns
+unban
 uncheck
 unchecked
 unchecking