Merge branch 'master' into messages
authorAndy Allan <github@gravitystorm.co.uk>
Wed, 3 Oct 2018 12:04:12 +0000 (14:04 +0200)
committerGitHub <noreply@github.com>
Wed, 3 Oct 2018 12:04:12 +0000 (14:04 +0200)
1  2 
.rubocop_todo.yml
app/models/notifier.rb
config/routes.rb
test/controllers/messages_controller_test.rb

index 78ed84ac3472c25a241428f9d93a9c35198aa8b3,293135907385bc9b3d0890b8be3db2ceac17c430..d3e51600ddd815bab3e57cfd794ac99cf4531f82
@@@ -51,10 -34,11 +34,11 @@@ Lint/HandleExceptions
  Metrics/AbcSize:
    Max: 280
  
- # Offense count: 41
+ # Offense count: 40
  # Configuration parameters: CountComments, ExcludedMethods.
+ # ExcludedMethods: refine
  Metrics/BlockLength:
 -  Max: 259
 +  Max: 262
  
  # Offense count: 11
  # Configuration parameters: CountBlocks.
Simple merge
Simple merge