diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-03-21 16:14:32 +0000 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-03-21 16:14:32 +0000 |
| commit | 15a72e05f53a8469eaa577e225a405b0ea02e08b (patch) | |
| tree | 232b7aaf88a1b05225febfc3af5b3f65fb175d81 /app/models/member.rb | |
| parent | 40c338a4bbcfbcb1da0a54acfdf730f6bae6763f (diff) | |
| download | gitlab-ce-15a72e05f53a8469eaa577e225a405b0ea02e08b.tar.gz | |
Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5063 to CEee-5063-to-ce-backport
Diffstat (limited to 'app/models/member.rb')
| -rw-r--r-- | app/models/member.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/member.rb b/app/models/member.rb index ec8156bbb01..e1a32148538 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -52,7 +52,7 @@ class Member < ActiveRecord::Base end # Like active, but without invites. For when a User is required. - scope :active_without_invites, -> do + scope :active_without_invites_and_requests, -> do left_join_users .where(users: { state: 'active' }) .non_request |