summaryrefslogtreecommitdiff
path: root/lib/tasks
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-05 18:10:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-05 18:10:05 +0000
commit585c8dce43fd374a18e48e03c7ba8b5b96395b14 (patch)
treebc91d7a2ea940133a7a6ac323e0be9eb6f513282 /lib/tasks
parent35cccb0c12024672d5a6e003fb0fb920fc9a323f (diff)
downloadgitlab-ce-585c8dce43fd374a18e48e03c7ba8b5b96395b14.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/tasks')
-rw-r--r--lib/tasks/gitlab/gitaly.rake2
-rw-r--r--lib/tasks/gitlab/helpers.rake4
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index df75b3cf716..cafa06e2a67 100644
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
@@ -3,7 +3,7 @@
namespace :gitlab do
namespace :gitaly do
desc 'GitLab | Gitaly | Install or upgrade gitaly'
- task :install, [:dir, :storage_path, :repo] => :gitlab_environment do |t, args|
+ task :install, [:dir, :storage_path, :repo] => :with_gitlab_helpers do |t, args|
warn_user_is_not_gitlab
unless args.dir.present? && args.storage_path.present?
diff --git a/lib/tasks/gitlab/helpers.rake b/lib/tasks/gitlab/helpers.rake
index b61b1833c5a..220a333fbd6 100644
--- a/lib/tasks/gitlab/helpers.rake
+++ b/lib/tasks/gitlab/helpers.rake
@@ -6,3 +6,7 @@ StateMachines::Machine.ignore_method_conflicts = true if ENV['CRON']
task gitlab_environment: :environment do
extend SystemCheck::Helpers
end
+
+task :with_gitlab_helpers do
+ extend SystemCheck::Helpers
+end