summaryrefslogtreecommitdiff
path: root/lib/tasks
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-21 12:08:35 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-21 12:08:35 +0000
commitcd6e1ccea48e770d74296f4fdb8957d3cfb073f3 (patch)
tree36342527e2d281fc1ce52709c31b2ee9190f7685 /lib/tasks
parent29bc2e44c530aa7c534a5ca5720012e17863f33f (diff)
downloadgitlab-ce-cd6e1ccea48e770d74296f4fdb8957d3cfb073f3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/tasks')
-rw-r--r--lib/tasks/gitlab/db.rake7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index 026511d5943..84de21ea102 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -426,9 +426,10 @@ namespace :gitlab do
end
end
- Rake::Task['db:migrate'].enhance do
- Rake::Task['gitlab:db:dictionary:generate'].invoke if Rails.env.development?
- end
+ # Temporary disable this, see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85760#note_998452069
+ # Rake::Task['db:migrate'].enhance do
+ # Rake::Task['gitlab:db:dictionary:generate'].invoke if Rails.env.development?
+ # end
end
end
end