Add latest changes from gitlab-org/gitlab@master

app/models/project.rb

@@ -343,6 +343,7 @@ class Project < ApplicationRecord
   delegate :last_pipeline, to: :commit, allow_nil: true
   delegate :external_dashboard_url, to: :metrics_setting, allow_nil: true, prefix: true
   delegate :default_git_depth, :default_git_depth=, to: :ci_cd_settings, prefix: :ci
+  delegate :forward_deployment_enabled, :forward_deployment_enabled=, :forward_deployment_enabled?, to: :ci_cd_settings
   # Validations
   validates :creator, presence: true, on: :create

app/models/project_ci_cd_setting.rb

@@ -18,6 +18,8 @@ class ProjectCiCdSetting < ApplicationRecord
     },
     allow_nil: true
+  default_value_for :forward_deployment_enabled, true
+
   def self.available?
     @available ||=
       ActiveRecord::Migrator.current_version >= MINIMUM_SCHEMA_VERSION
@@ -28,6 +30,10 @@ class ProjectCiCdSetting < ApplicationRecord
     super
   end
+  def forward_deployment_enabled?
+    super && ::Feature.enabled?(:forward_deployment_enabled, project)
+  end
+
   private
   def set_default_git_depth

app/presenters/commit_status_presenter.rb

@@ -14,6 +14,7 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
     unmet_prerequisites: 'The job failed to complete prerequisite tasks',
     scheduler_failure: 'The scheduler failed to assign job to the runner, please try again or contact system administrator',
     data_integrity_failure: 'There has been a structural integrity problem detected, please contact system administrator',
+    forward_deployment_failure: 'The deployment job is older than the previously succeeded deployment job, and therefore cannot be run',
     invalid_bridge_trigger: 'This job could not be executed because downstream pipeline trigger definition is invalid',
     downstream_bridge_project_not_found: 'This job could not be executed because downstream bridge project could not be found',
     insufficient_bridge_permissions: 'This job could not be executed because of insufficient permissions to create a downstream pipeline',

app/services/deployments/older_deployments_drop_service.rb

+# frozen_string_literal: true
+
+module Deployments
+  class OlderDeploymentsDropService
+    attr_reader :deployment
+
+    def initialize(deployment_id)
+      @deployment = Deployment.find_by_id(deployment_id)
+    end
+
+    def execute
+      return unless @deployment&.running?
+
+      older_deployments.find_each do |older_deployment|
+        older_deployment.deployable&.drop!(:forward_deployment_failure)
+      rescue => e
+        Gitlab::ErrorTracking.track_exception(e, subject_id: @deployment.id, deployment_id: older_deployment.id)
+      end
+    end
+
+    private
+
+    def older_deployments
+      @deployment
+        .environment
+        .active_deployments
+        .older_than(@deployment)
+        .with_deployable
+    end
+  end
+end

app/views/help/_shortcuts.html.haml

@@ -6,6 +6,7 @@
           = _('Keyboard Shortcuts')
           %small
             = link_to _('(Show all)'), '#', class: 'js-more-help-button'
+        .js-toggle-shortcuts
         %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
           %span{ "aria-hidden": true } ×
       .modal-body

app/views/layouts/header/_help_dropdown.html.haml

@@ -4,6 +4,10 @@
       = link_to _("Help"), help_path
     %li
       = link_to _("Support"), support_url
+    %li
+      %button.js-shortcuts-modal-trigger{ type: "button" }
+        = _("Keyboard shortcuts")
+        %span.text-secondary.float-right{ "aria-hidden": true }= '?'.html_safe
     = render_if_exists "shared/learn_gitlab_menu_item"
     %li.divider
   %li

app/views/projects/pipelines/show.html.haml

@@ -21,4 +21,5 @@
     = render "projects/pipelines/with_tabs", pipeline: @pipeline
 .js-pipeline-details-vue{ data: { endpoint: project_pipeline_path(@project, @pipeline, format: :json),
-  test_report_endpoint: test_report_project_pipeline_path(@project, @pipeline, format: :json) } }
+  test_report_endpoint: test_report_project_pipeline_path(@project, @pipeline, format: :json),
+  test_reports_count_endpoint: test_reports_count_project_pipeline_path(@project, @pipeline, format: :json) } }

app/workers/all_queues.yml

@@ -225,6 +225,12 @@
   :latency_sensitive: 
   :resource_boundary: :cpu
   :weight: 3
+- :name: deployment:deployments_forward_deployment
+  :feature_category: :continuous_delivery
+  :has_external_dependencies: 
+  :latency_sensitive: 
+  :resource_boundary: :unknown
+  :weight: 3
 - :name: deployment:deployments_success
   :feature_category: :continuous_delivery
   :has_external_dependencies: 

app/workers/deployments/forward_deployment_worker.rb

+# frozen_string_literal: true
+
+module Deployments
+  class ForwardDeploymentWorker
+    include ApplicationWorker
+
+    queue_namespace :deployment
+    feature_category :continuous_delivery
+
+    def perform(deployment_id)
+      Deployments::OlderDeploymentsDropService.new(deployment_id).execute
+    end
+  end
+end

changelogs/unreleased/22113-improve-keyboard-shortcuts-or-allow-them-to-be-disabled.yml

+---
+title: Allow keyboard shortcuts to be disabled
+merge_request: 18782
+author:
+type: added

changelogs/unreleased/25276-allow-forward-deploys-only.yml

+---
+title: Allow to deploy only forward deployments
+merge_request: 22959
+author:
+type: changed

changelogs/unreleased/psi-mermaid-details.yml

+---
+title: Correctly render mermaid digrams inside details blocks
+merge_request: 23662
+author:
+type: fixed

db/migrate/20200124143014_add_restrict_deployment_order_to_project_ci_cd_settings.rb

+# frozen_string_literal: true
+
+class AddRestrictDeploymentOrderToProjectCiCdSettings < ActiveRecord::Migration[5.2]
+  DOWNTIME = false
+
+  def change
+    add_column :project_ci_cd_settings, :forward_deployment_enabled, :boolean
+  end
+end

db/post_migrate/20200210062432_schedule_link_lfs_objects.rb

@@ -4,32 +4,11 @@ class ScheduleLinkLfsObjects < ActiveRecord::Migration[6.0]
   include Gitlab::Database::MigrationHelpers
   DOWNTIME = false
-  MIGRATION = 'LinkLfsObjects'
-  BATCH_SIZE = 1_000
   disable_ddl_transaction!
-  class Project < ActiveRecord::Base
-    include EachBatch
-
-    self.table_name = 'projects'
-  end
-
   def up
-    fork_network_members =
-      Gitlab::BackgroundMigration::LinkLfsObjects::ForkNetworkMember
-        .select(1)
-        .with_non_existing_lfs_objects
-        .where('fork_network_members.project_id = projects.id')
-
-    forks = Project.where('EXISTS (?)', fork_network_members)
-
-    queue_background_migration_jobs_by_range_at_intervals(
-      forks,
-      MIGRATION,
-      BackgroundMigrationWorker.minimum_interval,
-      batch_size: BATCH_SIZE
-    )
+    # no-op as background migration being schedule times out in some instances
   end
   def down

db/schema.rb

@@ -3166,6 +3166,7 @@ ActiveRecord::Schema.define(version: 2020_02_13_204737) do
     t.boolean "group_runners_enabled", default: true, null: false
     t.boolean "merge_pipelines_enabled"
     t.integer "default_git_depth"
+    t.boolean "forward_deployment_enabled"
     t.index ["project_id"], name: "index_project_ci_cd_settings_on_project_id", unique: true
   end

doc/user/shortcuts.md

@@ -6,7 +6,10 @@ disqus_identifier: 'https://docs.gitlab.com/ee/workflow/shortcuts.html'
 # GitLab keyboard shortcuts
 GitLab has many useful keyboard shortcuts to make it easier to access different features.
-You can see the quick reference sheet within GitLab itself with <kbd>Shift</kbd> + <kbd>?</kbd>.
+You can see a modal listing keyboard shortcuts within GitLab itself by pressing <kbd>?</kbd>,
+or clicking **Keyboard shortcuts** in the Help menu at the top right.
+From [GitLab 12.8 onwards](https://gitlab.com/gitlab-org/gitlab/issues/22113),
+keyboard shortcuts can be disabled using the **Enable**/**Disable** toggle in this modal window.
 The [Global Shortcuts](#global-shortcuts) work from any area of GitLab, but you must
 be in specific pages for the other shortcuts to be available, as explained in each

lib/gitlab/background_migration/link_lfs_objects.rb

@@ -24,24 +24,7 @@ module Gitlab
       end
       def perform(start_id, end_id)
-        select_query =
-          ForkNetworkMember
-            .select('lop.lfs_object_id, fork_network_members.project_id')
-            .with_non_existing_lfs_objects
-            .where(project_id: start_id..end_id)
-
-        return if select_query.empty?
-
-        execute <<-SQL
-          INSERT INTO lfs_objects_projects (lfs_object_id, project_id)
-          #{select_query.to_sql}
-        SQL
-      end
-
-      private
-
-      def execute(sql)
-        ::ActiveRecord::Base.connection.execute(sql)
+        # no-op as some queries times out
       end
     end
   end

lib/gitlab/ci/status/build/failed.rb

@@ -19,6 +19,7 @@ module Gitlab
             unmet_prerequisites: 'unmet prerequisites',
             scheduler_failure: 'scheduler failure',
             data_integrity_failure: 'data integrity failure',
+            forward_deployment_failure: 'forward deployment failure',
             invalid_bridge_trigger: 'downstream pipeline trigger definition is invalid',
             downstream_bridge_project_not_found: 'downstream project could not be found',
             insufficient_bridge_permissions: 'no permissions to trigger downstream pipeline',

lib/quality/kubernetes_client.rb

@@ -63,7 +63,7 @@ module Quality
         'get',
         RESOURCE_LIST,
         %(--namespace "#{namespace}"),
-        '-o custom-columns=NAME:.metadata.name'
+        '-o name'
       ]
       run_command(command).lines.map(&:strip)
     end

locale/gitlab.pot

@@ -375,6 +375,12 @@ msgid_plural "%{releases} releases"
 msgstr[0] ""
 msgstr[1] ""
+msgid "%{screenreaderOnlyStart}Keyboard shorcuts%{screenreaderOnlyEnd} Disabled"
+msgstr ""
+
+msgid "%{screenreaderOnlyStart}Keyboard shorcuts%{screenreaderOnlyEnd} Enabled"
+msgstr ""
+
 msgid "%{service_title} activated."
 msgstr ""
@@ -7155,6 +7161,9 @@ msgstr ""
 msgid "Enable mirror configuration"
 msgstr ""
+msgid "Enable or disable keyboard shortcuts"
+msgstr ""
+
 msgid "Enable or disable the Pseudonymizer data collection."
 msgstr ""
@@ -10945,6 +10954,9 @@ msgstr ""
 msgid "Keyboard Shortcuts"
 msgstr ""
+msgid "Keyboard shortcuts"
+msgstr ""
+
 msgid "Kubernetes"
 msgstr ""
@@ -15857,6 +15869,9 @@ msgstr ""
 msgid "Remove child epic from an epic"
 msgstr ""
+msgid "Remove description history"
+msgstr ""
+
 msgid "Remove due date"
 msgstr ""
@@ -17780,6 +17795,9 @@ msgstr ""
 msgid "Something went wrong while closing the %{issuable}. Please try again later"
 msgstr ""
+msgid "Something went wrong while deleting description changes. Please try again."
+msgstr ""
+
 msgid "Something went wrong while deleting the image."
 msgstr ""