Commit 721014c9 authored by James Lopez's avatar James Lopez

Revert "Fix merge conflicts - squashed commit"

This reverts commit 3e991230.
parent 3e991230

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -4,46 +4,46 @@
.bundle
.chef
.directory
/.envrc
/.gitlab_shell_secret
.envrc
.gitlab_shell_secret
.idea
/.rbenv-version
.rbenv-version
.rbx/
/.ruby-gemset
/.ruby-version
/.rvmrc
.ruby-gemset
.ruby-version
.rvmrc
.sass-cache/
/.secret
/.vagrant
/.byebug_history
/Vagrantfile
/backups/*
/config/aws.yml
/config/database.yml
/config/gitlab.yml
/config/gitlab_ci.yml
/config/initializers/rack_attack.rb
/config/initializers/smtp_settings.rb
/config/initializers/relative_url.rb
/config/resque.yml
/config/unicorn.rb
/config/secrets.yml
/config/sidekiq.yml
/coverage/*
/db/*.sqlite3
/db/*.sqlite3-journal
/db/data.yml
/doc/code/*
/dump.rdb
/log/*.log*
/nohup.out
/public/assets/
/public/uploads.*
/public/uploads/
/shared/artifacts/
/rails_best_practices_output.html
.secret
.vagrant
.byebug_history
Vagrantfile
backups/*
config/aws.yml
config/database.yml
config/gitlab.yml
config/gitlab_ci.yml
config/initializers/rack_attack.rb
config/initializers/smtp_settings.rb
config/initializers/relative_url.rb
config/resque.yml
config/unicorn.rb
config/secrets.yml
config/sidekiq.yml
coverage/*
db/*.sqlite3
db/*.sqlite3-journal
db/data.yml
doc/code/*
dump.rdb
log/*.log*
nohup.out
public/assets/
public/uploads.*
public/uploads/
shared/artifacts/
rails_best_practices_output.html
/tags
/tmp/*
/vendor/bundle/*
/builds/*
/shared/*
tmp/
vendor/bundle/*
builds/*
shared/*
require: rubocop-rspec
AllCops:
TargetRubyVersion: 2.1
# Cop names are not displayed in offense messages by default. Change behavior
......@@ -23,7 +21,6 @@ AllCops:
- 'lib/email_validator.rb'
- 'lib/gitlab/upgrader.rb'
- 'lib/gitlab/seeder.rb'
- 'generator_templates/**/*'
##################### Style ##################################
......@@ -59,7 +56,7 @@ Style/AndOr:
# Use `Array#join` instead of `Array#*`.
Style/ArrayJoin:
Enabled: true
Enabled: false
# Use only ascii symbols in comments.
Style/AsciiComments:
......@@ -71,7 +68,7 @@ Style/AsciiIdentifiers:
# Checks for uses of Module#attr.
Style/Attr:
Enabled: true
Enabled: false
# Avoid the use of BEGIN blocks.
Style/BeginBlock:
......@@ -83,7 +80,7 @@ Style/BarePercentLiterals:
# Do not use block comments.
Style/BlockComments:
Enabled: true
Enabled: false
# Put end statement of multiline block on its own line.
Style/BlockEndNewline:
......@@ -124,7 +121,7 @@ Style/ClassCheck:
# Use self when defining module/class methods.
Style/ClassMethods:
Enabled: true
Enabled: false
# Avoid the use of class variables.
Style/ClassVars:
......@@ -154,7 +151,7 @@ Style/ConstantName:
# Use def with parentheses when there are arguments.
Style/DefWithParentheses:
Enabled: true
Enabled: false
# Checks for use of deprecated Hash methods.
Style/DeprecatedHashMethods:
......@@ -218,15 +215,15 @@ Style/EmptyLiteral:
# Avoid the use of END blocks.
Style/EndBlock:
Enabled: true
Enabled: false
# Use Unix-style line endings.
Style/EndOfLine:
Enabled: true
Enabled: false
# Favor the use of Fixnum#even? && Fixnum#odd?
Style/EvenOdd:
Enabled: true
Enabled: false
# Do not use unnecessary spacing.
Style/ExtraSpacing:
......@@ -234,20 +231,15 @@ Style/ExtraSpacing:
# Use snake_case for source file names.
Style/FileName:
Enabled: true
# Checks for a line break before the first parameter in a multi-line method
# parameter definition.
Style/FirstMethodParameterLineBreak:
Enabled: true
Enabled: false
# Checks for flip flops.
Style/FlipFlop:
Enabled: true
Enabled: false
# Checks use of for or each in multiline loops.
Style/For:
Enabled: true
Enabled: false
# Enforce the use of Kernel#sprintf, Kernel#format or String#%.
Style/FormatString:
......@@ -255,7 +247,7 @@ Style/FormatString:
# Do not introduce global variables.
Style/GlobalVars:
Enabled: true
Enabled: false
# Check for conditionals that can be replaced with guard clauses.
Style/GuardClause:
......@@ -276,7 +268,7 @@ Style/IfUnlessModifier:
# Do not use if x; .... Use the ternary operator instead.
Style/IfWithSemicolon:
Enabled: true
Enabled: false
# Checks that conditional statements do not have an identical line at the
# end of each branch, which can validly be moved out of the conditional.
......@@ -284,9 +276,9 @@ Style/IdenticalConditionalBranches:
Enabled: false
# Checks the indentation of the first line of the right-hand-side of a
# multi-line assignment.
# multi-line assignment.
Style/IndentAssignment:
Enabled: true
Enabled: false
# Keep indentation straight.
Style/IndentationConsistency:
......@@ -306,7 +298,7 @@ Style/IndentHash:
# Use Kernel#loop for infinite loops.
Style/InfiniteLoop:
Enabled: true
Enabled: false
# Use the new lambda literal syntax for single-line blocks.