Merge branch 'master' into next
authorTom Hughes <tom@compton.nu>
Sun, 10 Jun 2018 16:02:12 +0000 (17:02 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 10 Jun 2018 16:02:12 +0000 (17:02 +0100)
commitd3700e6201b4b78a70bbb2941572edc985b63c2c
tree2d4eb04a354537b1101e72378da630359f44d38f
parent2aca6920dc3488a381b275d21a31344da02029e6
parente4b94f4e5ef195dd5743ab3a510caecb7525a3b7
Merge branch 'master' into next
19 files changed:
.rubocop_todo.yml
Gemfile
Gemfile.lock
app/assets/stylesheets/common.scss
app/models/user.rb
app/views/browse/note.html.erb
app/views/diary_entry/_diary_comment.html.erb
app/views/diary_entry/_diary_entry.html.erb
app/views/layouts/_header.html.erb
app/views/user/view.html.erb
config/locales/en.yml
config/routes.rb
test/models/issue_test.rb
test/models/report_test.rb
test/system/issues_test.rb
test/system/report_diary_comment_test.rb
test/system/report_diary_entry_test.rb
test/system/report_note_test.rb
test/system/report_user_test.rb