summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-07-13 12:08:45 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-07-13 12:12:47 -0600
commit9468b07925a1ab47fc485bf6baddaf4e89252b08 (patch)
tree87d88c48255b4a0ce746a1cd44d7182408256e63
parentc4cbf3effa2c19ebcdcd3943b46ed9296c6e609e (diff)
downloadgitlab-ce-9468b07925a1ab47fc485bf6baddaf4e89252b08.tar.gz
Resolve feedback.
-rw-r--r--.rubocop_todo.yml95
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock2
3 files changed, 44 insertions, 55 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8204fd82a63..3478d86f1fa 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config --exclude-limit 8`
-# on 2016-07-05 10:30:07 -0600 using RuboCop version 0.41.1.
+# on 2016-07-13 12:03:44 -0600 using RuboCop version 0.41.2.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
@@ -10,21 +10,16 @@
Lint/AmbiguousRegexpLiteral:
Enabled: false
-# Offense count: 42
+# Offense count: 43
# Configuration parameters: AllowSafeAssignment.
Lint/AssignmentInCondition:
Enabled: false
-# Offense count: 1
-Lint/DuplicateMethods:
- Exclude:
- - 'lib/gitlab/github_import/branch_formatter.rb'
-
# Offense count: 14
Lint/HandleExceptions:
Enabled: false
-# Offense count: 20
+# Offense count: 21
Lint/IneffectiveAccessModifier:
Enabled: false
@@ -34,7 +29,7 @@ Lint/Loop:
- 'app/mailers/notify.rb'
- 'lib/gitlab/bitbucket_import/client.rb'
-# Offense count: 12
+# Offense count: 15
Lint/ShadowingOuterLocalVariable:
Enabled: false
@@ -46,7 +41,7 @@ Lint/StringConversionInInterpolation:
- 'app/services/system_hooks_service.rb'
- 'app/services/system_note_service.rb'
-# Offense count: 42
+# Offense count: 44
# Cop supports --auto-correct.
# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
Lint/UnusedBlockArgument:
@@ -81,14 +76,13 @@ Performance/RedundantBlockCall:
- 'app/controllers/application_controller.rb'
- 'lib/gitlab/backend/shell.rb'
-# Offense count: 5
+# Offense count: 4
# Cop supports --auto-correct.
Performance/RedundantMatch:
Exclude:
- 'app/models/external_issue.rb'
- 'lib/extracts_path.rb'
- 'lib/gitlab/diff/highlight.rb'
- - 'lib/gitlab/diff/inline_diff.rb'
- 'lib/gitlab/diff/parser.rb'
# Offense count: 24
@@ -97,11 +91,11 @@ Performance/RedundantMatch:
Performance/RedundantMerge:
Enabled: false
-# Offense count: 59
+# Offense count: 60
Rails/OutputSafety:
Enabled: false
-# Offense count: 125
+# Offense count: 128
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: strict, flexible
Rails/TimeZone:
@@ -114,7 +108,7 @@ Rails/TimeZone:
Rails/Validation:
Enabled: false
-# Offense count: 218
+# Offense count: 217
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
# SupportedStyles: with_first_parameter, with_fixed_indentation
@@ -135,18 +129,19 @@ Style/AndOr:
Style/BarePercentLiterals:
Enabled: false
-# Offense count: 256
+# Offense count: 258
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: braces, no_braces, context_dependent
Style/BracesAroundHashParameters:
Enabled: false
-# Offense count: 4
+# Offense count: 5
Style/CaseEquality:
Exclude:
- 'app/helpers/auth_helper.rb'
- 'app/models/commit.rb'
+ - 'app/models/protected_branch.rb'
- 'app/services/projects/download_service.rb'
- 'config/initializers/trusted_proxies.rb'
@@ -165,21 +160,21 @@ Style/CommentAnnotation:
- 'lib/api/entities.rb'
- 'spec/requests/api/project_snippets_spec.rb'
-# Offense count: 35
+# Offense count: 34
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly.
# SupportedStyles: assign_to_condition, assign_inside_condition
Style/ConditionalAssignment:
Enabled: false
-# Offense count: 773
+# Offense count: 788
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: leading, trailing
Style/DotPosition:
Enabled: false
-# Offense count: 14
+# Offense count: 13
Style/DoubleNegation:
Enabled: false
@@ -205,7 +200,7 @@ Style/EmptyLiteral:
- 'lib/gitlab/fogbugz_import/importer.rb'
- 'spec/lib/gitlab/workhorse_spec.rb'
-# Offense count: 119
+# Offense count: 123
# Cop supports --auto-correct.
# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
Style/ExtraSpacing:
@@ -223,44 +218,36 @@ Style/FormatString:
- 'lib/gitlab/version_info.rb'
- 'spec/requests/api/issues_spec.rb'
-# Offense count: 50
+# Offense count: 48
# Configuration parameters: MinBodyLength.
Style/GuardClause:
Enabled: false
-# Offense count: 9
-Style/IdenticalConditionalBranches:
- Exclude:
- - 'app/controllers/projects_controller.rb'
- - 'app/models/project_services/irker_service.rb'
- - 'app/services/merge_requests/refresh_service.rb'
- - 'lib/rouge/formatters/html_gitlab.rb'
-
-# Offense count: 10
+# Offense count: 11
Style/IfInsideElse:
Enabled: false
-# Offense count: 179
+# Offense count: 177
# Cop supports --auto-correct.
# Configuration parameters: MaxLineLength.
Style/IfUnlessModifier:
Enabled: false
-# Offense count: 48
+# Offense count: 50
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
# SupportedStyles: special_inside_parentheses, consistent, align_brackets
Style/IndentArray:
Enabled: false
-# Offense count: 85
+# Offense count: 89
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
# SupportedStyles: special_inside_parentheses, consistent, align_braces
Style/IndentHash:
Enabled: false
-# Offense count: 11
+# Offense count: 12
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: line_count_dependent, lambda, literal
@@ -269,6 +256,7 @@ Style/Lambda:
- 'app/models/ci/runner.rb'
- 'app/models/event.rb'
- 'app/models/note.rb'
+ - 'app/models/notification_setting.rb'
- 'config/routes.rb'
- 'lib/api/entities.rb'
- 'spec/models/concerns/participable_spec.rb'
@@ -299,7 +287,7 @@ Style/MultilineTernaryOperator:
- 'lib/banzai/filter/relative_link_filter.rb'
- 'spec/support/api_helpers.rb'
-# Offense count: 61
+# Offense count: 62
# Cop supports --auto-correct.
Style/MutableConstant:
Enabled: false
@@ -314,14 +302,14 @@ Style/NestedParenthesizedCalls:
- 'spec/lib/gitlab/email/message/repository_push_spec.rb'
- 'spec/services/ci/create_builds_service_spec.rb'
-# Offense count: 13
+# Offense count: 12
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
# SupportedStyles: skip_modifier_ifs, always
Style/Next:
Enabled: false
-# Offense count: 6
+# Offense count: 8
# Cop supports --auto-correct.
# Configuration parameters: EnforcedOctalStyle, SupportedOctalStyles.
# SupportedOctalStyles: zero_with_o, zero_only
@@ -330,6 +318,7 @@ Style/NumericLiteralPrefix:
- 'config/initializers/1_settings.rb'
- 'config/initializers/secret_token.rb'
- 'lib/gitlab/backend/shell.rb'
+ - 'spec/lib/gitlab/git/hook_spec.rb'
- 'spec/support/test_env.rb'
- 'spec/tasks/gitlab/backup_rake_spec.rb'
@@ -338,7 +327,7 @@ Style/NumericLiteralPrefix:
Style/ParallelAssignment:
Enabled: false
-# Offense count: 206
+# Offense count: 208
# Cop supports --auto-correct.
# Configuration parameters: PreferredDelimiters.
Style/PercentLiteralDelimiters:
@@ -356,12 +345,12 @@ Style/PercentQLiterals:
- 'spec/models/project_services/teamcity_service_spec.rb'
- 'spec/workers/repository_import_worker_spec.rb'
-# Offense count: 14
+# Offense count: 13
# Cop supports --auto-correct.
Style/PerlBackrefs:
Enabled: false
-# Offense count: 30
+# Offense count: 32
# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
# NamePrefix: is_, has_, have_
# NamePrefixBlacklist: is_, has_, have_
@@ -369,7 +358,7 @@ Style/PerlBackrefs:
Style/PredicateName:
Enabled: false
-# Offense count: 27
+# Offense count: 28
# Cop supports --auto-correct.
Style/PreferredHashMethods:
Enabled: false
@@ -405,24 +394,24 @@ Style/RedundantException:
Exclude:
- 'app/helpers/preferences_helper.rb'
-# Offense count: 21
+# Offense count: 23
# Cop supports --auto-correct.
Style/RedundantFreeze:
Enabled: false
-# Offense count: 321
+# Offense count: 377
# Cop supports --auto-correct.
Style/RedundantSelf:
Enabled: false
-# Offense count: 92
+# Offense count: 94
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
# SupportedStyles: slashes, percent_r, mixed
Style/RegexpLiteral:
Enabled: false
-# Offense count: 14
+# Offense count: 17
# Cop supports --auto-correct.
Style/RescueModifier:
Enabled: false
@@ -477,7 +466,7 @@ Style/SpaceBeforeFirstArg:
- 'spec/services/projects/fork_service_spec.rb'
- 'spec/services/system_note_service_spec.rb'
-# Offense count: 129
+# Offense count: 130
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
# SupportedStyles: space, no_space
@@ -501,7 +490,7 @@ Style/SpaceInsidePercentLiteralDelimiters:
- 'lib/event_filter.rb'
- 'lib/gitlab/git_access.rb'
-# Offense count: 33
+# Offense count: 36
# Cop supports --auto-correct.
# Configuration parameters: SupportedStyles.
# SupportedStyles: use_perl_names, use_english_names
@@ -529,7 +518,7 @@ Style/SymbolProc:
Style/TrailingCommaInArguments:
Enabled: false
-# Offense count: 117
+# Offense count: 114
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
# SupportedStyles: comma, consistent_comma, no_comma
@@ -545,10 +534,10 @@ Style/TrailingUnderscoreVariable:
- 'app/controllers/invites_controller.rb'
- 'app/controllers/projects/git_http_controller.rb'
- 'app/helpers/tab_helper.rb'
- - 'lib/gitlab/force_push_check.rb'
+ - 'lib/gitlab/checks/force_push.rb'
- 'lib/gitlab/logger.rb'
-# Offense count: 88
+# Offense count: 90
# Cop supports --auto-correct.
Style/TrailingWhitespace:
Enabled: false
@@ -570,7 +559,7 @@ Style/UnlessElse:
- 'lib/gitlab/backend/grack_auth.rb'
- 'lib/gitlab/project_search_results.rb'
-# Offense count: 14
+# Offense count: 13
# Cop supports --auto-correct.
Style/UnneededInterpolation:
Enabled: false
@@ -585,4 +574,4 @@ Style/ZeroLengthPredicate:
- 'app/models/project_services/asana_service.rb'
- 'app/models/repository.rb'
- 'lib/extracts_path.rb'
- - 'lib/gitlab/force_push_check.rb'
+ - 'lib/gitlab/checks/force_push.rb'
diff --git a/Gemfile b/Gemfile
index 0769214a071..7f16e0bd18c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -299,7 +299,7 @@ group :development, :test do
gem 'spring-commands-spinach', '~> 1.1.0'
gem 'spring-commands-teaspoon', '~> 0.0.2'
- gem 'rubocop', '~> 0.41.1', require: false
+ gem 'rubocop', '~> 0.41.2', require: false
gem 'rubocop-rspec', '~> 1.5.0', require: false
gem 'scss_lint', '~> 0.47.0', require: false
gem 'simplecov', '~> 0.11.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 6f93a534359..cb3a3af47cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -937,7 +937,7 @@ DEPENDENCIES
rqrcode-rails3 (~> 0.1.7)
rspec-rails (~> 3.5.0)
rspec-retry (~> 0.4.5)
- rubocop (~> 0.41.1)
+ rubocop (~> 0.41.2)
rubocop-rspec (~> 1.5.0)
ruby-fogbugz (~> 0.2.1)
sanitize (~> 2.0)