diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-03-13 16:23:59 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-03-15 13:50:38 +0100 |
| commit | e97cdb042d941c989b303137c42e4c22f535f36b (patch) | |
| tree | 048f5b00760d24ac92950f7180e1cc2691d21da5 | |
| parent | bbdf23261c00de58b18948381b0cc206e7d3501f (diff) | |
| download | gitlab-ce-e97cdb042d941c989b303137c42e4c22f535f36b.tar.gz | |
Remove old team scopes.
| -rw-r--r-- | app/models/issue.rb | 1 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 1 | ||||
| -rw-r--r-- | app/models/project.rb | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 19e43ebd788..6e102051387 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -32,7 +32,6 @@ class Issue < ActiveRecord::Base validates :project, presence: true scope :of_group, ->(group) { where(project_id: group.project_ids) } - scope :of_user_team, ->(team) { where(project_id: team.project_ids, assignee_id: team.member_ids) } scope :cared, ->(user) { where(assignee_id: user) } scope :open_for, ->(user) { opened.assigned_to(user) } diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index f758126cfeb..4cbdc612297 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -115,7 +115,6 @@ class MergeRequest < ActiveRecord::Base validate :validate_fork scope :of_group, ->(group) { where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)", group_project_ids: group.project_ids) } - scope :of_user_team, ->(team) { where("(source_project_id in (:team_project_ids) OR target_project_id in (:team_project_ids) AND assignee_id in (:team_member_ids))", team_project_ids: team.project_ids, team_member_ids: team.member_ids) } scope :merged, -> { with_state(:merged) } 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) } diff --git a/app/models/project.rb b/app/models/project.rb index f0b416c8f4a..1d1ae569fc2 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -157,7 +157,6 @@ class Project < ActiveRecord::Base scope :without_user, ->(user) { where('projects.id NOT IN (:ids)', ids: user.authorized_projects.map(&:id) ) } scope :without_team, ->(team) { team.projects.present? ? where('projects.id NOT IN (:ids)', ids: team.projects.map(&:id)) : scoped } scope :not_in_group, ->(group) { where('projects.id NOT IN (:ids)', ids: group.project_ids ) } - scope :in_team, ->(team) { where('projects.id IN (:ids)', ids: team.projects.map(&:id)) } scope :in_namespace, ->(namespace) { where(namespace_id: namespace.id) } scope :in_group_namespace, -> { joins(:group) } scope :personal, ->(user) { where(namespace_id: user.namespace_id) } |