Commit 742aa6bd authored by Stan Hu's avatar Stan Hu

Merge branch 'duplicate_scope_user' into 'master'

Remove duplicate scope present in user.rb

See merge request gitlab-org/gitlab!18058
parents 93053a84 279dfef2
...@@ -40,8 +40,6 @@ module EE ...@@ -40,8 +40,6 @@ module EE
has_many :approvals, dependent: :destroy # rubocop: disable Cop/ActiveRecordDependent has_many :approvals, dependent: :destroy # rubocop: disable Cop/ActiveRecordDependent
has_many :approvers, dependent: :destroy # rubocop: disable Cop/ActiveRecordDependent has_many :approvers, dependent: :destroy # rubocop: disable Cop/ActiveRecordDependent
has_many :developer_groups, -> { where(members: { access_level: ::Gitlab::Access::DEVELOPER }) }, through: :group_members, source: :group
has_many :users_ops_dashboard_projects has_many :users_ops_dashboard_projects
has_many :ops_dashboard_projects, through: :users_ops_dashboard_projects, source: :project has_many :ops_dashboard_projects, through: :users_ops_dashboard_projects, source: :project
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment