diff --git a/app/views/merge_requests/show.html.erb b/app/views/merge_requests/show.html.erb index b0a8d0736..dc35f40ca 100644 --- a/app/views/merge_requests/show.html.erb +++ b/app/views/merge_requests/show.html.erb @@ -27,7 +27,7 @@ <% unless @merge_request.status == "request_merged" %>
<% end %> diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 10901623f..41031c840 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -28,9 +28,10 @@ RSpec.describe MergeRequest, type: :model do let(:merge_request) { create(:merge_request) } it "sets the discarded_at field to the current time" do - Timecop.freeze(Time.zone.now) do + let(:time) { Time.zone.now } + Timecop.freeze(time) do merge_request.discard! - expect(merge_request.discarded_at).to eq(Time.zone.now) + expect(merge_request.discarded_at).to eq(time) end end