Add latest changes from gitlab-org/gitlab@master

.rubocop.yml

@@ -155,11 +155,10 @@ Rails/ApplicationRecord:
     # as they need to be as decoupled from application code as possible
     - db/**/*.rb
     - lib/gitlab/background_migration/**/*.rb
+    - ee/lib/ee/gitlab/background_migration/**/*.rb
     - lib/gitlab/database/**/*.rb
     - spec/**/*.rb
     - ee/db/**/*.rb
-    - ee/lib/gitlab/background_migration/**/*.rb
-    - ee/lib/ee/gitlab/background_migration/**/*.rb
     - ee/spec/**/*.rb
 # GitLab ###################################################################
@@ -233,7 +232,8 @@ RSpec/FactoriesInMigrationSpecs:
     - 'spec/migrations/**/*.rb'
     - 'ee/spec/migrations/**/*.rb'
     - 'spec/lib/gitlab/background_migration/**/*.rb'
-    - 'ee/spec/lib/gitlab/background_migration/**/*.rb'
+    - 'spec/lib/ee/gitlab/background_migration/**/*.rb'
+    - 'ee/spec/lib/ee/gitlab/background_migration/**/*.rb'
 Cop/IncludeActionViewContext:
   Enabled: true
@@ -365,4 +365,4 @@ Style/MultilineWhenThen:
   Enabled: false
 Style/FloatDivision:
-  Enabled: false
\ No newline at end of file
+  Enabled: false

app/assets/javascripts/ide/stores/actions.js

@@ -16,21 +16,7 @@ export const redirectToUrl = (self, url) => visitUrl(url);
 export const setInitialData = ({ commit }, data) => commit(types.SET_INITIAL_DATA, data);
 export const discardAllChanges = ({ state, commit, dispatch }) => {
-  state.changedFiles.forEach(file => {
-    if (file.tempFile || file.prevPath) dispatch('closeFile', file);
-
-    if (file.tempFile) {
-      dispatch('deleteEntry', file.path);
-    } else if (file.prevPath) {
-      dispatch('renameEntry', {
-        path: file.path,
-        name: file.prevName,
-        parentPath: file.prevParentPath,
-      });
-    } else {
-      commit(types.DISCARD_FILE_CHANGES, file.path);
-    }
-  });
+  state.changedFiles.forEach(file => dispatch('restoreOriginalFile', file.path));
   commit(types.REMOVE_ALL_CHANGES_FILES);
 };

app/assets/javascripts/ide/stores/actions/file.js

@@ -191,38 +191,47 @@ export const setFileViewMode = ({ commit }, { file, viewMode }) => {
   commit(types.SET_FILE_VIEWMODE, { file, viewMode });
 };
-export const discardFileChanges = ({ dispatch, state, commit, getters }, path) => {
+export const restoreOriginalFile = ({ dispatch, state, commit }, path) => {
   const file = state.entries[path];
+  const isDestructiveDiscard = file.tempFile || file.prevPath;
   if (file.deleted && file.parentPath) {
     dispatch('restoreTree', file.parentPath);
   }
-  if (file.tempFile || file.prevPath) {
+  if (isDestructiveDiscard) {
     dispatch('closeFile', file);
-    if (file.tempFile) {
-      dispatch('deleteEntry', file.path);
-    } else {
-      commit(types.DISCARD_FILE_CHANGES, file.path);
-      dispatch('renameEntry', {
-        path: file.path,
-        name: file.prevName,
-        parentPath: file.prevParentPath,
-      });
-    }
+  }
+  if (file.tempFile) {
+    dispatch('deleteEntry', file.path);
   } else {
-    commit(types.DISCARD_FILE_CHANGES, path);
-
-    if (getters.activeFile && file.path === getters.activeFile.path) {
-      dispatch('updateDelayViewerUpdated', true)
-        .then(() => {
-          router.push(`/project${file.url}`);
-        })
-        .catch(e => {
-          throw e;
-        });
-    }
+    commit(types.DISCARD_FILE_CHANGES, file.path);
+  }
+
+  if (file.prevPath) {
+    dispatch('renameEntry', {
+      path: file.path,
+      name: file.prevName,
+      parentPath: file.prevParentPath,
+    });
+  }
+};
+
+export const discardFileChanges = ({ dispatch, state, commit, getters }, path) => {
+  const file = state.entries[path];
+  const isDestructiveDiscard = file.tempFile || file.prevPath;
+
+  dispatch('restoreOriginalFile', path);
+
+  if (!isDestructiveDiscard && file.path === getters.activeFile?.path) {
+    dispatch('updateDelayViewerUpdated', true)
+      .then(() => {
+        router.push(`/project${file.url}`);
+      })
+      .catch(e => {
+        throw e;
+      });
   }
   commit(types.REMOVE_FILE_FROM_CHANGED, path);

app/views/shared/issuable/_search_bar.html.haml

 - type = local_assigns.fetch(:type)
 - board = local_assigns.fetch(:board, nil)
+- show_sorting_dropdown = local_assigns.fetch(:show_sorting_dropdown, true)
 - is_not_boards_modal_or_productivity_analytics = type != :boards_modal && type != :productivity_analytics
 - block_css_class = is_not_boards_modal_or_productivity_analytics ? 'row-content-block second-block' : ''
 - user_can_admin_list = board && can?(current_user, :admin_list, board.resource_parent)
@@ -169,5 +170,5 @@
           - if @project
             #js-add-issues-btn.prepend-left-10{ data: { can_admin_list: can?(current_user, :admin_list, @project) } }
         #js-toggle-focus-btn
-      - elsif is_not_boards_modal_or_productivity_analytics
+      - elsif is_not_boards_modal_or_productivity_analytics && show_sorting_dropdown
         = render 'shared/issuable/sort_dropdown'

changelogs/unreleased/30229-background-migration-pruneorphanedgeoevents-did-you-mean-pruneoldev.yml

+---
+title: 'Fix: undefined background migration classes for EE-CE downgrades'
+merge_request: 22160
+author:
+type: fixed

changelogs/unreleased/fe-ide-clean-up-discard-duplication.yml

+---
+title: Fix discard all to behave like discard single file in Web IDE
+merge_request: 22572
+author:
+type: fixed

doc/ci/merge_request_pipelines/index.md

@@ -161,7 +161,7 @@ test:
   only: [merge_requests]
   except:
     variables:
-      $CI_COMMIT_REF_NAME =~ /^docs-/
+      - $CI_COMMIT_REF_NAME =~ /^docs-/
 ```
 ## Important notes about merge requests from forked projects

doc/ci/quick_start/README.md

@@ -17,34 +17,29 @@ NOTE: **Note:**
 Coming over to GitLab from Jenkins? Check out our [reference](../jenkins/index.md)
 for converting your pre-existing pipelines over to our format.
-GitLab offers a [continuous integration][ci] service. If you
-[add a `.gitlab-ci.yml` file][yaml] to the root directory of your repository,
-and configure your GitLab project to use a [Runner], then each commit or
-push triggers your CI [pipeline].
-The `.gitlab-ci.yml` file tells the GitLab Runner what to do. By default it runs
-a pipeline with three [stages]: `build`, `test`, and `deploy`. You don't need to
-use all three stages; stages with no jobs are simply ignored.
-If everything runs OK (no non-zero return values), you'll get a nice green
-checkmark associated with the commit. This makes it
-easy to see whether a commit caused any of the tests to fail before
-you even look at the code.
-Most projects use GitLab's CI service to run the test suite so that
-developers get immediate feedback if they broke something.
-There's a growing trend to use continuous delivery and continuous deployment to
-automatically deploy tested code to staging and production environments.
-So in brief, the steps needed to have a working CI can be summed up to:
-1. Add `.gitlab-ci.yml` to the root directory of your repository
-1. Configure a Runner
-
-From there on, on every push to your Git repository, the Runner will
-automatically start the pipeline and the pipeline will appear under the
-project's **Pipelines** page.
+GitLab offers a [continuous integration](https://about.gitlab.com/product/continuous-integration/) service. For each commit or push to trigger your CI
+[pipeline](../pipelines.md), you must:
+- Add a [`.gitlab-ci.yml` file](#creating-a-gitlab-ciyml-file) to your repository's root directory.
+- Ensure your project is configured to use a [Runner](#configuring-a-runner).
+The `.gitlab-ci.yml` file tells the GitLab Runner what to do. A simple pipeline commonly has
+three [stages](../yaml/README.md#stages):
+- `build`
+- `test`
+- `deploy`
+You do not need to use all three stages; stages with no jobs are ignored.
+The pipeline appears under the project's **CI/CD > Pipelines** page. If everything runs OK (no non-zero
+return values), you get a green check mark associated with the commit. This makes it easy to see
+whether a commit caused any of the tests to fail before you even look at the job (test) log. Many projects use
+GitLab's CI service to run the test suite, so developers get immediate feedback if they broke
+something.
+It's also common to use pipelines to automatically deploy
+tested code to staging and production environments.
 ---
@@ -237,9 +232,4 @@ CI with various languages.
 [runner-install]: https://docs.gitlab.com/runner/install/
 [blog-ci]: https://about.gitlab.com/blog/2015/05/06/why-were-replacing-gitlab-ci-jobs-with-gitlab-ci-dot-yml/
 [examples]: ../examples/README.md
-[ci]: https://about.gitlab.com/product/continuous-integration/
-[yaml]: ../yaml/README.md
-[runner]: ../runners/README.md
 [enabled]: ../enable_or_disable_ci.md
-[stages]: ../yaml/README.md#stages
-[pipeline]: ../pipelines.md

doc/ci/yaml/README.md

@@ -2719,10 +2719,10 @@ can lead to errors during the deployment.
 To avoid these errors, the `resource_group` attribute can be used to ensure that
 the Runner will not run certain jobs simultaneously.
-When the `resource_group` key is defined in a job in `.gitlab-ci.yml`,
-job runs are mutually exclusive across different pipelines in the same project.
+When the `resource_group` key is defined for a job in `.gitlab-ci.yml`,
+job executions are mutually exclusive across different pipelines for the same project.
 If multiple jobs belonging to the same resource group are enqueued simultaneously,
-only one of them will be picked by the Runner, and the other jobs will wait until the
+only one of the jobs will be picked by the Runner, and the other jobs will wait until the
 `resource_group` is free.
 Here is a simple example:

lib/gitlab/background_migration/backfill_version_data_from_gitaly.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # rubocop: disable Style/Documentation
+    class BackfillVersionDataFromGitaly
+      def perform(issue_id)
+      end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::BackfillVersionDataFromGitaly.prepend_if_ee('EE::Gitlab::BackgroundMigration::BackfillVersionDataFromGitaly')

lib/gitlab/background_migration/generate_gitlab_subscriptions.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # rubocop: disable Style/Documentation
+    class GenerateGitlabSubscriptions
+      def perform(start_id, stop_id)
+      end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::GenerateGitlabSubscriptions.prepend_if_ee('EE::Gitlab::BackgroundMigration::GenerateGitlabSubscriptions')

lib/gitlab/background_migration/migrate_approver_to_approval_rules.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # rubocop: disable Style/Documentation
+    class MigrateApproverToApprovalRules
+      # @param target_type [String] class of target, either 'MergeRequest' or 'Project'
+      # @param target_id [Integer] id of target
+      def perform(target_type, target_id, sync_code_owner_rule: true)
+      end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::MigrateApproverToApprovalRules.prepend_if_ee('EE::Gitlab::BackgroundMigration::MigrateApproverToApprovalRules')

lib/gitlab/background_migration/migrate_approver_to_approval_rules_check_progress.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # rubocop: disable Style/Documentation
+    class MigrateApproverToApprovalRulesCheckProgress
+      def perform
+      end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesCheckProgress.prepend_if_ee('EE::Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesCheckProgress')

lib/gitlab/background_migration/migrate_approver_to_approval_rules_in_batch.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # rubocop: disable Style/Documentation
+    class MigrateApproverToApprovalRulesInBatch
+      def perform(start_id, end_id)
+      end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesInBatch.prepend_if_ee('EE::Gitlab::BackgroundMigration::MigrateApproverToApprovalRulesInBatch')

lib/gitlab/background_migration/move_epic_issues_after_epics.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # rubocop: disable Style/Documentation
+    class MoveEpicIssuesAfterEpics
+      def perform(start_id, stop_id)
+      end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::MoveEpicIssuesAfterEpics.prepend_if_ee('EE::Gitlab::BackgroundMigration::MoveEpicIssuesAfterEpics')

lib/gitlab/background_migration/populate_any_approval_rule_for_merge_requests.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # This background migration creates any approver rule records according
+    # to the given merge request IDs range. A _single_ INSERT is issued for the given range.
+    class PopulateAnyApprovalRuleForMergeRequests
+      def perform(from_id, to_id)
+      end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForMergeRequests.prepend_if_ee('EE::Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForMergeRequests')

lib/gitlab/background_migration/populate_any_approval_rule_for_projects.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # This background migration creates any approver rule records according
+    # to the given project IDs range. A _single_ INSERT is issued for the given range.
+    class PopulateAnyApprovalRuleForProjects
+      def perform(from_id, to_id)
+      end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForProjects.prepend_if_ee('EE::Gitlab::BackgroundMigration::PopulateAnyApprovalRuleForProjects')

lib/gitlab/background_migration/prune_orphaned_geo_events.rb

+# frozen_string_literal: true
+#
+# rubocop:disable Style/Documentation
+
+# This job is added to fix https://gitlab.com/gitlab-org/gitlab/issues/30229
+# It's not used anywhere else.
+# Can be removed in GitLab 13.*
+module Gitlab
+  module BackgroundMigration
+    class PruneOrphanedGeoEvents
+      def perform(table_name)
+      end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::PruneOrphanedGeoEvents.prepend_if_ee('EE::Gitlab::BackgroundMigration::PruneOrphanedGeoEvents')

lib/gitlab/background_migration/update_authorized_keys_file_since.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # rubocop: disable Style/Documentation
+    class UpdateAuthorizedKeysFileSince
+      def perform(cutoff_datetime)
+      end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::UpdateAuthorizedKeysFileSince.prepend_if_ee('EE::Gitlab::BackgroundMigration::UpdateAuthorizedKeysFileSince')

lib/gitlab/background_migration/update_vulnerability_confidence.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # rubocop: disable Style/Documentation
+    class UpdateVulnerabilityConfidence
+      def perform(start_id, stop_id)
+      end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::UpdateVulnerabilityConfidence.prepend_if_ee('EE::Gitlab::BackgroundMigration::UpdateVulnerabilityConfidence')