diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-15 22:49:16 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-15 22:49:16 +0000 |
| commit | 714ae482c1f211dab7e63cf4f679942d2bce8a77 (patch) | |
| tree | 28e931ab7f05aaf09fcce2ca983d98ba8175c2ab | |
| parent | 8a028cf3a25a80b696635c62297f775664da8c2a (diff) | |
| parent | e8785ded1e922a72989614d7e70e9c26c367f1aa (diff) | |
| download | gitlab-ce-714ae482c1f211dab7e63cf4f679942d2bce8a77.tar.gz | |
Merge branch 'rs-silence-statemachine-in-cron' into 'master'
Prevent StateMachine warnings from outputting during a cron task
[ci skip]
Closes #5931
See merge request !2458
| -rw-r--r-- | lib/tasks/gitlab/task_helpers.rake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/tasks/gitlab/task_helpers.rake b/lib/tasks/gitlab/task_helpers.rake index 8c63877e51c..d33b5b31e18 100644 --- a/lib/tasks/gitlab/task_helpers.rake +++ b/lib/tasks/gitlab/task_helpers.rake @@ -4,6 +4,9 @@ end String.disable_colorization = true unless STDOUT.isatty +# Prevent StateMachine warnings from outputting during a cron task +StateMachines::Machine.ignore_method_conflicts = true if ENV['CRON'] + namespace :gitlab do # Ask if the user wants to continue |