Merge branch 'gitlab-housekeeper-color-diff' into 'master'

Force diff output to color gitlab-housekeeper preview

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141839



Merged-by: Rémy Coutable <remy@rymai.me>
Approved-by: Tiger Watson <twatson@gitlab.com>
Approved-by: Rémy Coutable <remy@rymai.me>
Co-authored-by: Dylan Griffith <dyl.griffith@gmail.com>

gems/gitlab-housekeeper/lib/gitlab/housekeeper/runner.rb

@@ -77,7 +77,8 @@ def dry_run(change, branch_name)
         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
 

gems/gitlab-housekeeper/spec/gitlab/housekeeper/runner_spec.rb

@@ -83,13 +83,13 @@
 
       # 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',