diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-08-19 14:45:24 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-08-19 14:45:24 +0000 |
| commit | 3028cd687a256b593272248e50a3174811594e64 (patch) | |
| tree | 5777662f6eae8e530912a8fad12bd23d2bc748fc /app | |
| parent | 4d4e88df01554336daf245a68653b80ca00989a5 (diff) | |
| parent | f53112de5931144ac74819f87c227f06e115ba58 (diff) | |
| download | gitlab-ce-3028cd687a256b593272248e50a3174811594e64.tar.gz | |
Merge branch '39-count-unique-users-for-more-accurate-smau-reporting' into 'master'
Allow UsageData.count to use count_by:
See merge request gitlab-org/gitlab-ce!30770
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/members/group_member.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb index f6b19317c50..3d6f397e599 100644 --- a/app/models/members/group_member.rb +++ b/app/models/members/group_member.rb @@ -15,8 +15,8 @@ class GroupMember < Member default_scope { where(source_type: SOURCE_TYPE) } scope :of_groups, ->(groups) { where(source_id: groups.select(:id)) } - scope :count_users_by_group_id, -> { joins(:user).group(:source_id).count } + scope :of_ldap_type, -> { where(ldap: true) } after_create :update_two_factor_requirement, unless: :invite? after_destroy :update_two_factor_requirement, unless: :invite? |