From 9068083f869ff46c2bd3e206b762312150fe8c4e Mon Sep 17 00:00:00 2001
From: Oswaldo Ferreira <oswaldo@gitlab.com>
Date: Thu, 10 Aug 2017 18:26:42 -0300
Subject: [PATCH] Add changelog

---
 app/models/merge_request.rb                           |  2 +-
 .../unreleased/36114-stuck-mrs-job-follow-up.yml      |  4 ++++
 spec/workers/merge_worker_spec.rb                     | 11 -----------
 3 files changed, 5 insertions(+), 12 deletions(-)
 create mode 100644 changelogs/unreleased/36114-stuck-mrs-job-follow-up.yml

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 1e212685c71..8c1ea5625db 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -392,7 +392,7 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def merge_ongoing?
-    merge_jid && !merged?
+    !!merge_jid && !merged?
   end
 
   def closed_without_fork?
diff --git a/changelogs/unreleased/36114-stuck-mrs-job-follow-up.yml b/changelogs/unreleased/36114-stuck-mrs-job-follow-up.yml
new file mode 100644
index 00000000000..1b664efb8c2
--- /dev/null
+++ b/changelogs/unreleased/36114-stuck-mrs-job-follow-up.yml
@@ -0,0 +1,4 @@
+---
+title: Present enqueued merge jobs as Merging as well
+merge_request:
+author:
diff --git a/spec/workers/merge_worker_spec.rb b/spec/workers/merge_worker_spec.rb
index ee51000161a..303193bab9b 100644
--- a/spec/workers/merge_worker_spec.rb
+++ b/spec/workers/merge_worker_spec.rb
@@ -27,15 +27,4 @@ describe MergeWorker do
       expect(source_project.repository.branch_names).not_to include('markdown')
     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
-- 
GitLab