Commit 9f27605c authored by Vanessa Silva's avatar Vanessa Silva
Browse files

Resolve conflicts

parents bc088319 26396256
Pipeline #41897 passed with stages
in 2 minutes and 50 seconds
......@@ -4,4 +4,4 @@ Style/Documentation:
Enabled: false
Layout/EndOfLine:
Enabled: False
\ No newline at end of file
Enabled: False
......@@ -133,13 +133,15 @@ Style/ClassAndModuleChildren:
- 'test/channels/application_cable/connection_test.rb'
- 'test/test_helper.rb'
# Offense count: 1
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.
# SupportedStyles: compact, expanded
Style/EmptyMethod:
Exclude:
- 'app/controllers/home_controller.rb'
# Offense count: 3
# Configuration parameters: AllowedConstants.
Style/Documentation:
Exclude:
- 'spec/**/*'
- 'test/**/*'
- 'app/helpers/application_helper.rb'
- 'app/models/application_record.rb'
- 'config/application.rb'
# Offense count: 1
# Cop supports --auto-correct.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment