Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-12 00:09:40 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-12 00:09:40 +0300
commit213f46f188c29e9c442df61530110e172a7e819e (patch)
tree8544300e523c4e8cc3955406fa58e2d4b8ded773 /lib/gitlab/background_migration
parent33f7ef81fd6bcab7bbdf0bc3f37d337256fb11fb (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/background_migration')
-rw-r--r--lib/gitlab/background_migration/batched_migration_job.rb2
-rw-r--r--lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/background_migration/batched_migration_job.rb b/lib/gitlab/background_migration/batched_migration_job.rb
index 973ab20f547..4039a79cfa7 100644
--- a/lib/gitlab/background_migration/batched_migration_job.rb
+++ b/lib/gitlab/background_migration/batched_migration_job.rb
@@ -27,7 +27,7 @@ module Gitlab
end
def operation_name(operation)
- define_method('operation_name') do
+ define_method(:operation_name) do
operation
end
end
diff --git a/lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb b/lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb
index 97a9913fa74..452167d4d61 100644
--- a/lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb
+++ b/lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb
@@ -186,7 +186,7 @@ module Gitlab
end
def migrate_instance_cluster?
- if instance_variable_defined?('@migrate_instance_cluster')
+ if instance_variable_defined?(:@migrate_instance_cluster)
@migrate_instance_cluster
else
@migrate_instance_cluster = Migratable::Cluster.instance_type.has_prometheus_application?