Add latest changes from gitlab-org/gitlab@master

4 files changed, 3 insertions, 17 deletions

diff --git a/lib/gitlab/background_migration/add_gitlab_instance_administration_project.rb b/lib/gitlab/background_migration/add_gitlab_instance_administration_project.rb
deleted file mode 100644
index 730f1acee98..00000000000
--- a/lib/gitlab/background_migration/add_gitlab_instance_administration_project.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-# rubocop:disable Style/Documentation
-
-module Gitlab
-  module BackgroundMigration
-    class AddGitlabInstanceAdministrationProject
-      def perform
-        Rails.logger.info("Creating Gitlab instance administration project") # rubocop:disable Gitlab/RailsLogger
-
-        Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService.new.execute!
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/background_migration/encrypt_runners_tokens.rb b/lib/gitlab/background_migration/encrypt_runners_tokens.rb
index 91e559a8765..ec64a73542e 100644
--- a/lib/gitlab/background_migration/encrypt_runners_tokens.rb
+++ b/lib/gitlab/background_migration/encrypt_runners_tokens.rb
@@ -13,7 +13,7 @@ module Gitlab
     #
     # We can solve this differently, see tech debt issue:
     #
-    # https://gitlab.com/gitlab-org/gitlab-ce/issues/54328
+    # https://gitlab.com/gitlab-org/gitlab-foss/issues/54328
     #
     class EncryptRunnersTokens < EncryptColumns
       def perform(model, from, to)
diff --git a/lib/gitlab/background_migration/fix_user_namespace_names.rb b/lib/gitlab/background_migration/fix_user_namespace_names.rb
index 1a207121be0..d767cbfd8f5 100644
--- a/lib/gitlab/background_migration/fix_user_namespace_names.rb
+++ b/lib/gitlab/background_migration/fix_user_namespace_names.rb
@@ -5,7 +5,7 @@ module Gitlab
     # This migration fixes the namespaces.name for all user-namespaces that have names
     # that aren't equal to the users name.
     # Then it uses the updated names of the namespaces to update the associated routes
-    # For more info see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23272
+    # For more info see https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/23272
     class FixUserNamespaceNames
       def perform(from_id, to_id)
         fix_namespace_names(from_id, to_id)
diff --git a/lib/gitlab/background_migration/fix_user_project_route_names.rb b/lib/gitlab/background_migration/fix_user_project_route_names.rb
index b84ff32e712..6b99685fd68 100644
--- a/lib/gitlab/background_migration/fix_user_project_route_names.rb
+++ b/lib/gitlab/background_migration/fix_user_project_route_names.rb
@@ -4,7 +4,7 @@ module Gitlab
   module BackgroundMigration
     # This migration fixes the routes.name for all user-projects that have names
     # that don't start with the users name.
-    # For more info see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23272
+    # For more info see https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/23272
     class FixUserProjectRouteNames
       def perform(from_id, to_id)
         ActiveRecord::Base.connection.execute <<~ROUTES_UPDATE