Commit 9068083f authored by Oswaldo Ferreira's avatar Oswaldo Ferreira

Add changelog

parent 4f17c6b7
...@@ -392,7 +392,7 @@ class MergeRequest < ActiveRecord::Base ...@@ -392,7 +392,7 @@ class MergeRequest < ActiveRecord::Base
end end
def merge_ongoing? def merge_ongoing?
merge_jid && !merged? !!merge_jid && !merged?
end end
def closed_without_fork? def closed_without_fork?
......
---
title: Present enqueued merge jobs as Merging as well
merge_request:
author:
...@@ -27,15 +27,4 @@ describe MergeWorker do ...@@ -27,15 +27,4 @@ describe MergeWorker do
expect(source_project.repository.branch_names).not_to include('markdown') expect(source_project.repository.branch_names).not_to include('markdown')
end end
end end
it 'persists merge_jid' do
merge_request = create(:merge_request, merge_jid: nil)
user = create(:user)
worker = described_class.new
allow(worker).to receive(:jid) { '999' }
expect { worker.perform(merge_request.id, user.id, {}) }
.to change { merge_request.reload.merge_jid }.from(nil).to('999')
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment