diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-17 15:01:20 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-17 15:01:20 +0000 |
| commit | 546fa165ff728bc2d25ed9b55b95dd1d48139d4a (patch) | |
| tree | 612a9800dba636c8053706363675bbac2c91c626 /app/models/member.rb | |
| parent | e47989a58b8a9f83855ea9210ba5786fc14fb841 (diff) | |
| parent | 170efaaba273792ddffc2806ef1501f33d87a5a2 (diff) | |
| download | gitlab-ce-546fa165ff728bc2d25ed9b55b95dd1d48139d4a.tar.gz | |
Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into 'master'
Enable Style/MultilineOperationIndentation in Rubocop
Fixes #25741
See merge request !8125
Diffstat (limited to 'app/models/member.rb')
| -rw-r--r-- | app/models/member.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/member.rb b/app/models/member.rb index 0312aef32fa..c585e0b450e 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -122,8 +122,8 @@ class Member < ActiveRecord::Base member = if user.is_a?(User) source.members.find_by(user_id: user.id) || - source.requesters.find_by(user_id: user.id) || - source.members.build(user_id: user.id) + source.requesters.find_by(user_id: user.id) || + source.members.build(user_id: user.id) else source.members.build(invite_email: user) end |