Unsubscribe from app. ref 14873
Minor fix
Spec comment fix
Merge branch 'errbit' into feature/upstream_merge
Merge upstream
Remove return(false) from before_filter "require_watcher_edit_priviledges"
Merge branch 'errbit' into feature/upstream_merge
report the actual url as request_url

Reporting the hash turns (for me) out to be error prone as I do not get the actual host.
Add Flowdock notification adapter
Update *from* email to display a valid Flowdock avatar
Flowdock doesn't validate or have some sort of confirmation for email addresses. As long as you know Flow API token you're free to post with any email.
Merge comment with problem during the merge of some problem

see #477
Merge pull request #253 from concordia-publishing-house/extract-fingerprint

Refactor: extract Fingerprint#generate from ErrorReport
Merge pull request #508 from shingara/features/merge_comment_too

Merge comment with problem during the merge of some problem
Upgrade to Devise 2.2.x version

The Devise version was old so we upgrade to the latest version
Merge branch 'features/update_devise'
udpate changelog [ci skip]
update hipchat gem
update some gem and dev gem [ci skip]
Extract I18n key from views/layouts/application.html.haml
Extract translation key on navigation and session bar