Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2018-03-11 20:55:24 +0300
committerDouwe Maan <douwe@selenight.nl>2018-03-11 20:57:25 +0300
commit3d078a9deecbe92fb0a465aa2ed808f0e54e9a35 (patch)
tree997af2a684782b1822a658c88e730e4924f870c7 /app/models/member.rb
parentfd85f14c6a82cfa667ec55500a4ae33478e61d2b (diff)
Prevent sending an access request to a project from failing when the project has invited members
Diffstat (limited to 'app/models/member.rb')
-rw-r--r--app/models/member.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/member.rb b/app/models/member.rb
index 36090676051..ec8156bbb01 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -55,7 +55,7 @@ class Member < ActiveRecord::Base
scope :active_without_invites, -> do
left_join_users
.where(users: { state: 'active' })
- .where(requested_at: nil)
+ .non_request
.reorder(nil)
end