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

Merge branch 'rs-silence-statemachine-in-cron' into 'master'
1c233ff5 · Robert Speicher · Robert Speicher · 1f1eed47 · 1c233ff5
Commit 1c233ff5 authored Jan 15, 2016 by Robert Speicher Committed by Robert Speicher Jan 15, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

task_helpers.rake lib/tasks/gitlab/task_helpers.rake +3 -0

No files found.
--- 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