diff options
author | Matija Čupić <matteeyah@gmail.com> | 2018-02-04 23:38:59 +0100 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2018-02-04 23:38:59 +0100 |
commit | 3366f377c1d4cbb02ecc5a2e47b059ed375c5e09 (patch) | |
tree | 6a19813b4820ad6d2813bf86b30d8e5be2bd10c6 /lib/tasks/gitlab/helpers.rake | |
parent | 0abce36cd20cdd3579138bee835d28519a5593f2 (diff) | |
parent | cf887a8b3108edb715ee5618377f4ffab1824d85 (diff) | |
download | gitlab-ce-3366f377c1d4cbb02ecc5a2e47b059ed375c5e09.tar.gz |
Merge branch 'master' into 38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour
Diffstat (limited to 'lib/tasks/gitlab/helpers.rake')
-rw-r--r-- | lib/tasks/gitlab/helpers.rake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/tasks/gitlab/helpers.rake b/lib/tasks/gitlab/helpers.rake index b0a24790c4a..14d1125a03d 100644 --- a/lib/tasks/gitlab/helpers.rake +++ b/lib/tasks/gitlab/helpers.rake @@ -1,8 +1,6 @@ -require 'tasks/gitlab/task_helpers' - # Prevent StateMachine warnings from outputting during a cron task StateMachines::Machine.ignore_method_conflicts = true if ENV['CRON'] -namespace :gitlab do +task gitlab_environment: :environment do extend SystemCheck::Helpers end |