Merge remote-tracking branch 'upstream/pull/2014'

diff --cc .rubocop.yml
Simple merge

diff --cc .rubocop_todo.yml
Simple merge

diff --cc app/controllers/messages_controller.rb
Simple merge

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