Add changelog

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?

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:

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