From 1c233ff5fed15014f62caeba7f256a1900f7f8a4 Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Fri, 15 Jan 2016 22:49:16 +0000
Subject: [PATCH] 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
---
 lib/tasks/gitlab/task_helpers.rake | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/tasks/gitlab/task_helpers.rake b/lib/tasks/gitlab/task_helpers.rake
index 8c63877e51..d33b5b31e1 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