glitch-soc/mastodon forked from tootsuite/mastodon

Fix tootsuite#2108 - Fix gif uploads (tootsuite#2171)
* Fix tootsuite#2108 - Fix gif uploads
Add specs for media attachment gifv conversion

* Add ffmpeg to travis

* Make travis install ffmpeg, not libav

* Switch travis to trusty

Fixed hungarian translation (tootsuite#2158)

Do not display "reset password" in admin UI for remote accounts (toot…
…suite#1960)

Merge branch 'matteoaquila-master'

Do not store last visited URL from API controllers (tootsuite#1330)
Sign-in redirects you back to last visited URL, but in case of API requests,
this sometimes redirected users to an API URL that, of course, greeted them
with an {"error":"The access token is invalid"}

Merge pull request #1146 from tootsuite/fix-object-type-nil-exception
Fix nil#object_type error

Remove bios from blocked users list, filter out broken entries from A…
…PI response

Fix statsd null backend not being initialized properly

Fix live status removal from public/hashtag channels

Improve how errors are displayed in the UI