Merge remote-tracking branch 'upstream/pull/2226'
authorTom Hughes <tom@compton.nu>
Tue, 18 Jun 2019 20:10:07 +0000 (21:10 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 18 Jun 2019 20:10:07 +0000 (21:10 +0100)
commit31edc7dff6f4305366d0f93d35ba3fb1956bb71f
tree49e07099254ea3f344924d0f308520bc5baf6f35
parent657ed03d8b2e262bc965cc38e8af190624c3295b
parent2142ff02c2442d28580ff99080bc1219c2bfe59f
Merge remote-tracking branch 'upstream/pull/2226'
app/abilities/ability.rb
app/views/diary_entries/_diary_comment.html.erb
app/views/diary_entries/_diary_entry.html.erb
test/controllers/diary_entries_controller_test.rb