diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-13 09:14:45 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-13 09:14:45 +0000 |
| commit | 2d865213cba628b5baefc7181bf7cf3a8897f0fd (patch) | |
| tree | 427d0832d1612808822ca92cc53857cc2d22a8f6 | |
| parent | 73e0754070865f8a38643df08438566b27c4c092 (diff) | |
| parent | 6d68ba287092428b49c9c9caa7b2cae03b7658b2 (diff) | |
| download | gitlab-ce-2d865213cba628b5baefc7181bf7cf3a8897f0fd.tar.gz | |
Merge branch 'rs-disable-colorization' into 'master'
Disable colorization if STDOUT is not a tty
Closes #6118
See merge request !2403
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/task_helpers.rake | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -247,7 +247,7 @@ group :development, :test do gem 'byebug', platform: :mri gem 'pry-rails' - gem 'awesome_print', '~> 1.2.0' + gem 'awesome_print', '~> 1.2.0', require: false gem 'fuubar', '~> 2.0.0' gem 'database_cleaner', '~> 1.4.0' diff --git a/lib/tasks/gitlab/task_helpers.rake b/lib/tasks/gitlab/task_helpers.rake index ebe516ec879..8c63877e51c 100644 --- a/lib/tasks/gitlab/task_helpers.rake +++ b/lib/tasks/gitlab/task_helpers.rake @@ -2,6 +2,8 @@ module Gitlab class TaskAbortedByUserError < StandardError; end end +String.disable_colorization = true unless STDOUT.isatty + namespace :gitlab do # Ask if the user wants to continue |