Commit 714ae482 authored by Robert Speicher's avatar Robert Speicher

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
parents 8a028cf3 e8785ded
...@@ -4,6 +4,9 @@ end ...@@ -4,6 +4,9 @@ end
String.disable_colorization = true unless STDOUT.isatty 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 namespace :gitlab do
# Ask if the user wants to continue # Ask if the user wants to continue
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment