Merge branch 'master' into messages

diff --cc .rubocop_todo.yml
index 78ed84ac3472c25a241428f9d93a9c35198aa8b3,293135907385bc9b3d0890b8be3db2ceac17c430..d3e51600ddd815bab3e57cfd794ac99cf4531f82
--- 1/.rubocop_todo.yml
--- 2/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@@ -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.

diff --cc app/models/notifier.rb
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc test/controllers/messages_controller_test.rb
Simple merge