Merge remote-tracking branch 'upstream/pull/2014'
authorTom Hughes <tom@compton.nu>
Wed, 3 Oct 2018 17:59:33 +0000 (18:59 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 3 Oct 2018 17:59:33 +0000 (18:59 +0100)
commitb8a8a88004d25837a10436fdc13128146b32c32b
treeef32bd0a5199b25521117f72d34111b8b6e18fc7
parent8877427ab9e49f509414c2fa4d71ccc3e2ac8796
parent3ec67ea2d395f9ae78f806f8e583e10d691861de
Merge remote-tracking branch 'upstream/pull/2014'
.rubocop.yml
.rubocop_todo.yml
app/controllers/messages_controller.rb
app/models/notifier.rb
config/routes.rb
test/controllers/messages_controller_test.rb