Move locked check to a guard-clause

app/models/merge_request.rb

@@ -398,7 +398,9 @@ class MergeRequest < ActiveRecord::Base
   def merge_ongoing?
     # While the MergeRequest is locked, it should present itself as 'merge ongoing'.
     # The unlocking process is handled by StuckMergeJobsWorker scheduled in Cron.
-    locked? || !!merge_jid && !merged? && Gitlab::SidekiqStatus.running?(merge_jid)
+    return true if locked?
+
+    !!merge_jid && !merged? && Gitlab::SidekiqStatus.running?(merge_jid)
   end
   def closed_without_fork?