From 52e0df5c23b94cc8f2929a97bc2211fd51bc1de4 Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Wed, 20 Feb 2013 17:37:20 +0400
Subject: [PATCH] class.self methods moved to scopes

---
 app/models/merge_request.rb | 21 +++------------------
 app/models/project.rb       |  2 +-
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 05ebf44..e8e15ae 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -81,24 +81,9 @@ class MergeRequest < ActiveRecord::Base
   validate  :validate_branches
 
   scope :merged, -> { with_state(:merged) }
-
-  class << self
-    def find_all_by_branch(branch_name)
-      where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name)
-    end
-
-    def cared(user)
-      where('assignee_id = :user OR author_id = :user', user: user.id)
-    end
-
-    def find_all_by_branch(branch_name)
-      where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name)
-    end
-
-    def find_all_by_milestone(milestone)
-      where("milestone_id = :milestone_id", milestone_id: milestone)
-    end
-  end
+  scope :by_branch, ->(branch_name) { where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name) }
+  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
+  scope :by_milestone, ->(milestone) { where("milestone_id = :milestone_id", milestone_id: milestone) }
 
   # DEPRECATED: Please use human_merge_status_name instead
   def human_merge_status
diff --git a/app/models/project.rb b/app/models/project.rb
index b7d688b..2120f53 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -424,7 +424,7 @@ class Project < ActiveRecord::Base
     c_ids = self.repository.commits_between(oldrev, newrev).map(&:id)
 
     # Update code for merge requests
-    mrs = self.merge_requests.opened.find_all_by_branch(branch_name).all
+    mrs = self.merge_requests.opened.by_branch(branch_name).all
     mrs.each { |merge_request| merge_request.reload_code; merge_request.mark_as_unchecked }
 
     # Close merge requests
--
libgit2 0.21.2