consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad merge conflict on rubocop_todo

Browse Source
This commit is contained in:
Bertocq
2017-06-19 10:46:39 +02:00
parent 15c92b27c8
commit 1eebc33da9
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.rubocop_todo.yml
View File

@@ -14,7 +14,6 @@ Lint/InheritException:
Exclude: Exclude:
- 'app/controllers/concerns/feature_flags.rb' - 'app/controllers/concerns/feature_flags.rb'
<<<<<<< HEAD
# Offense count: 13 # Offense count: 13
Lint/ParenthesesAsGroupedExpression: Lint/ParenthesesAsGroupedExpression:
Exclude: Exclude:
@@ -23,13 +22,6 @@ Lint/ParenthesesAsGroupedExpression:
- 'spec/features/proposals_spec.rb' - 'spec/features/proposals_spec.rb'
- 'spec/models/debate_spec.rb' - 'spec/models/debate_spec.rb'
# Offense count: 1
Lint/UnderscorePrefixedVariableName:
Exclude:
- 'lib/manager_authenticator.rb'
=======
>>>>>>> 0da0d145c... Fix Lint/UnderscorePrefixedVariableName issue and remove it from rubocop_todo file
# Offense count: 4 # Offense count: 4
# Cop supports --auto-correct. # Cop supports --auto-correct.
# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments. # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.