diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-15 00:12:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-15 00:12:27 +0300 |
commit | e916a9880b4ea8c7cd4d521b4260c4732e8e2978 (patch) | |
tree | dcc8f147c8152b25b738a7fbbfac79040ea6ae8d /app/models/member.rb | |
parent | 4db74ea1477fe70d132bf75f1bf3f1a728fc72e4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/member.rb')
-rw-r--r-- | app/models/member.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/member.rb b/app/models/member.rb index b46a497dd69..f01f34ad5b2 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -108,6 +108,8 @@ class Member < ApplicationRecord .reorder(nil) end + scope :active_state, -> { where(state: STATE_ACTIVE) } + scope :connected_to_user, -> { where.not(user_id: nil) } # This scope is exclusively used to get the members @@ -128,7 +130,8 @@ class Member < ApplicationRecord end scope :without_invites_and_requests, -> do - non_request + active_state + .non_request .non_invite .non_minimal_access end |