Merge branch 'i18n' of git://github.com/otwcode/otwarchive
Merge branch 'master' of git://github.com/otwcode/otwarchive
Merge branch 'master' of git://github.com/otwcode/otwarchive
get master in sync
Raise ActiveRecord::RecordNotFound when we don't find things
Follow Elz's comments ( make test simpler ).
Raise more  ActiveRecord::RecordNotFound
Probably want /bookmarks to still work
Fix test
Try this approach
clutching at straws
I don't think testing something that raises Active Record not found is easy, eg https://www.ruby-forum.com/topic/214631
Following Araina's , rules
Following Araina's , rules
Merge pull request #1768 from zz9pzza/issue_3919

0.9.18 - Issue 3919 Use 404 rather than hard error or redirect.