summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-19 09:43:41 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-19 09:43:41 +0200
commitbfc359ca61bd7e7ffea714b4ad64a7d9927441c3 (patch)
tree27d193c8f51add1bd153054f5273bac72312e49f /app/models/merge_request.rb
parentba937b2b3d81a7a9d3097387150fe8c8f2d784ca (diff)
downloadgitlab-ce-bfc359ca61bd7e7ffea714b4ad64a7d9927441c3.tar.gz
Fix project filter for MR on dashboard
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb17
1 files changed, 12 insertions, 5 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 345b8d6e07d..ac7c9f74ff0 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -43,12 +43,19 @@ class MergeRequest < ActiveRecord::Base
validates :target_branch, presence: true
validate :validate_branches
- def self.find_all_by_branch(branch_name)
- where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name)
- end
- def self.find_all_by_milestone(milestone)
- where("milestone_id = :milestone_id", milestone_id: milestone)
+ class << self
+ 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
def human_state