Merge branch 'rs-fix-time-based-broken-master' into 'master'

Freeze date in merge request status view spec

See merge request gitlab-org/gitlab-ce!25671

(cherry picked from commit c994484d)

a05aba61 Freeze date in merge request status view spec

spec/views/projects/issues/_merge_requests_status.html.haml_spec.rb

@@ -2,6 +2,12 @@
 require 'spec_helper'
 
 describe 'projects/issues/_merge_requests_status.html.haml' do
+  around do |ex|
+    Timecop.freeze(Date.new(2018, 7, 22)) do
+      ex.run
+    end
+  end
+
   it 'shows date of status change in tooltip' do
     merge_request = create(:merge_request, created_at: 1.month.ago)