diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-07 09:10:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-07 09:10:26 +0000 |
| commit | f4c6fbb86fbec3e5917e317b3490232d98531881 (patch) | |
| tree | a2648b816d6be98456303f4059e342fe850c6c7e /lib/tasks | |
| parent | 362b615a84bf303d5b5b1c3168d6592fb4306d9d (diff) | |
| download | gitlab-ce-f4c6fbb86fbec3e5917e317b3490232d98531881.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/gitlab/gitaly.rake | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/helpers.rake | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake index cafa06e2a67..df75b3cf716 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] => :with_gitlab_helpers do |t, args| + task :install, [:dir, :storage_path, :repo] => :gitlab_environment 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 220a333fbd6..b61b1833c5a 100644 --- a/lib/tasks/gitlab/helpers.rake +++ b/lib/tasks/gitlab/helpers.rake @@ -6,7 +6,3 @@ 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 |