summaryrefslogtreecommitdiff
path: root/app/models/member.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-21 17:29:35 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:31:56 -0600
commit3dadf306ddc81183e74b048bc4119796852ed7ea (patch)
treef01d5e7eb9c5550bc34a42d9e88479cd3fef578d /app/models/member.rb
parent547063b3ac096dff25309b6e0846b0d5f417c128 (diff)
downloadgitlab-ce-3dadf306ddc81183e74b048bc4119796852ed7ea.tar.gz
Enable Style/DotPosition
Diffstat (limited to 'app/models/member.rb')
-rw-r--r--app/models/member.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/member.rb b/app/models/member.rb
index d07f270b757..0f6b75b0b93 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -39,9 +39,9 @@ class Member < ActiveRecord::Base
is_external_invite = arel_table[:user_id].eq(nil).and(arel_table[:invite_token].not_eq(nil))
user_is_active = User.arel_table[:state].eq(:active)
- includes(:user).references(:users)
- .where(is_external_invite.or(user_is_active))
- .where(requested_at: nil)
+ includes(:user).references(:users).
+ where(is_external_invite.or(user_is_active)).
+ where(requested_at: nil)
end
scope :invite, -> { where.not(invite_token: nil) }