Introduce Pipeline#merge_requests_with_active_first,

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6019#note_16956802

1 files changed, 8 insertions, 4 deletions

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 2cf9892edc5..bf2d861b86f 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -293,10 +293,14 @@ module Ci
     # the merge request's latest commit.
     def merge_requests
       @merge_requests ||=
-        begin
-          project.merge_requests.where(source_branch: self.ref).
-            select { |merge_request| merge_request.pipeline.try(:id) == self.id }
-        end
+        project.merge_requests.where(source_branch: ref).
+          select { |merge_request| merge_request.pipeline.try(:id) == id }
+    end
+
+    def merge_requests_with_active_first
+      merge_requests.sort_by do |merge_request|
+        [merge_request.state_priority, -merge_request.updated_at.to_i]
+      end
     end
 
     private