diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-08 17:29:31 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-08 17:29:31 +0300 |
| commit | 7fefb0397eea99910537541bbba70d0a68a44644 (patch) | |
| tree | d55212a519b4db2d161c00361e70089d241f63f2 /app/models/merge_request.rb | |
| parent | 02c3bb7a32058a355756f0f77b2b8208913205e5 (diff) | |
| download | gitlab-ce-7fefb0397eea99910537541bbba70d0a68a44644.tar.gz | |
Fix filter context. Dont duplicate target project name for MR
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 9abdd41ec4e..b7df2e40a16 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -93,8 +93,8 @@ class MergeRequest < ActiveRecord::Base 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) } - scope :by_project, ->(project_id) { where("source_project_id = :project_id OR target_project_id = :project_id", project_id: project_id) } scope :in_projects, ->(project_ids) { where("source_project_id in (:project_ids) OR target_project_id in (:project_ids)", project_ids: project_ids) } + scope :of_projects, ->(ids) { where(target_project_id: ids) } # Closed scope for merge request should return # both merged and closed mr's scope :closed, -> { with_states(:closed, :merged) } |