Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 3 deletions

diff --git a/gems/gitlab-housekeeper/lib/gitlab/housekeeper/runner.rb b/gems/gitlab-housekeeper/lib/gitlab/housekeeper/runner.rb
index 45d52a0bd8b..1be94e15f37 100644
--- a/gems/gitlab-housekeeper/lib/gitlab/housekeeper/runner.rb
+++ b/gems/gitlab-housekeeper/lib/gitlab/housekeeper/runner.rb
@@ -77,7 +77,8 @@ module Gitlab
         puts
 
         puts '=> Diff:'
-        puts Shell.execute('git', '--no-pager', 'diff', 'master', branch_name, '--', *change.changed_files)
+        puts Shell.execute('git', '--no-pager', 'diff', '--color=always', 'master', branch_name, '--',
+          *change.changed_files)
         puts
       end
 
diff --git a/gems/gitlab-housekeeper/spec/gitlab/housekeeper/runner_spec.rb b/gems/gitlab-housekeeper/spec/gitlab/housekeeper/runner_spec.rb
index d1fdbcb1004..d3267cb001f 100644
--- a/gems/gitlab-housekeeper/spec/gitlab/housekeeper/runner_spec.rb
+++ b/gems/gitlab-housekeeper/spec/gitlab/housekeeper/runner_spec.rb
@@ -83,13 +83,13 @@ RSpec.describe ::Gitlab::Housekeeper::Runner do
 
       # Branches get shown and pushed
       expect(::Gitlab::Housekeeper::Shell).to receive(:execute)
-        .with('git', '--no-pager', 'diff', 'master',
+        .with('git', '--no-pager', 'diff', '--color=always', 'master',
           'the-identifier-for-the-first-change', '--', 'change1.txt', 'change2.txt')
       expect(::Gitlab::Housekeeper::Shell).to receive(:execute)
         .with('git', 'push', '-f', 'housekeeper',
           'the-identifier-for-the-first-change:the-identifier-for-the-first-change')
       expect(::Gitlab::Housekeeper::Shell).to receive(:execute)
-        .with('git', '--no-pager', 'diff', 'master',
+        .with('git', '--no-pager', 'diff', '--color=always', 'master',
           'the-identifier-for-the-second-change', '--', 'change1.txt', 'change2.txt')
       expect(::Gitlab::Housekeeper::Shell).to receive(:execute)
         .with('git', 'push', '-f', 'housekeeper',