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 | |
| 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')
| -rw-r--r-- | app/models/member.rb | 4 | ||||
| -rw-r--r-- | app/models/network/graph.rb | 4 | ||||
| -rw-r--r-- | app/models/project_services/issue_tracker_service.rb | 4 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
4 files changed, 7 insertions, 7 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 diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb index 345041a6ad1..b524ca50ee8 100644 --- a/app/models/network/graph.rb +++ b/app/models/network/graph.rb @@ -161,8 +161,8 @@ module Network def is_overlap?(range, overlap_space) range.each do |i| if i != range.first && - i != range.last && - @commits[i].spaces.include?(overlap_space) + i != range.last && + @commits[i].spaces.include?(overlap_space) return true end diff --git a/app/models/project_services/issue_tracker_service.rb b/app/models/project_services/issue_tracker_service.rb index 207bb816ad1..bce2cdd5516 100644 --- a/app/models/project_services/issue_tracker_service.rb +++ b/app/models/project_services/issue_tracker_service.rb @@ -85,8 +85,8 @@ class IssueTrackerService < Service def enabled_in_gitlab_config Gitlab.config.issues_tracker && - Gitlab.config.issues_tracker.values.any? && - issues_tracker + Gitlab.config.issues_tracker.values.any? && + issues_tracker end def issues_tracker diff --git a/app/models/user.rb b/app/models/user.rb index a2812d68384..3a17c98eff6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -392,7 +392,7 @@ class User < ActiveRecord::Base def namespace_uniq # Return early if username already failed the first uniqueness validation return if errors.key?(:username) && - errors[:username].include?('has already been taken') + errors[:username].include?('has already been taken') existing_namespace = Namespace.by_path(username) if existing_namespace && existing_namespace != namespace |