Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.		2018-08-10 16:22:31 +02:00
..
controllers	Introduce OAuth scopes for bookmarks	2018-08-10 15:26:52 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-10 16:22:31 +02:00
features
fixtures	Slightly reduce RAM usage (#7301)	2018-05-02 18:58:48 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-16 14:50:42 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-16 14:50:42 +02:00
mailers
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-10 16:22:31 +02:00
policies	Add test to disallow remote users from fetching local-only toots	2018-07-31 15:41:04 +02:00
presenters
requests	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
routing
services	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-06-12 13:17:21 +00:00
support
validators	Merge remote-tracking branch 'origin/master' into gs-master	2018-03-27 10:44:12 -05:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-10 16:22:31 +02:00
workers
rails_helper.rb	Slightly reduce RAM usage (#7301)	2018-05-02 18:58:48 +02:00
spec_helper.rb	Disable simplecov on CircleCI (#7416)	2018-05-09 16:59:58 +02:00