diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/issuable.rb | 1 | ||||
| -rw-r--r-- | app/models/issue.rb | 1 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index 88de1a037aa..24818a927ed 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -21,6 +21,7 @@ module Issuable scope :recent, -> { order("created_at DESC") } scope :assigned, -> { where("assignee_id IS NOT NULL") } scope :unassigned, -> { where("assignee_id IS NULL") } + scope :of_projects, ->(ids) { where(project_id: ids) } delegate :name, :email, diff --git a/app/models/issue.rb b/app/models/issue.rb index c171941928c..550041a0224 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -27,7 +27,6 @@ class Issue < ActiveRecord::Base scope :of_user_team, ->(team) { where(project_id: team.project_ids, assignee_id: team.member_ids) } scope :opened, -> { with_state(:opened) } scope :closed, -> { with_state(:closed) } - scope :by_project, ->(project_id) {where(project_id:project_id)} attr_accessible :title, :assignee_id, :position, :description, :milestone_id, :label_list, :author_id_of_changes, 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) } |