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
The start of work to pull the ts calls out of the application helpers so we
ensure that ts is not called twice eg ts(ts('AO3 News'))
Didn't use symbols correctly
Add more things to the header key
Add a dashboard key
Make mergable
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
Change VCR library to Webmock instead of Typheous
Update the Webmock version to stop VCR whining
Revert Gemfile.lock