mastodon/app/controllers/api/v1/statuses
Thibaut Girka 4df3b7cb06 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/follower_domains_controller.rb
  Removed upstream. Did the same here. Maybe we should not have?
- config/locales/en.yml
  Upstream removed the “Authorized followers” page and associated
  translations. This is too close in the file to our glitch-soc-specific
  “flavour” string. No actual conflict.
- config/locales/ja.yml
  Same as above.
- config/locales/pl.yml
  Same as above.
- config/navigation.rb
  No real conflict. New route added too close to the glitch-soc-specific
  “flavours” one.
- config/webpack/configuration.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- config/webpack/loaders/babel.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
  The contents of this file have been moved to package.json.
- config/webpack/shared.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- config/webpacker.yml
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- jest.config.js
  The contents of this file have been moved to package.json.
- package.json
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- yarn.lock
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
2019-03-16 14:14:20 +01:00
..
bookmarks_controller.rb Introduce OAuth scopes for bookmarks 2018-08-10 16:49:06 +02:00
favourited_by_accounts_controller.rb Extract counters from accounts table to account_stats table (#9295) 2018-11-19 00:43:52 +01:00
favourites_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
mutes_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
pins_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
reblogged_by_accounts_controller.rb Fix REST API showing non-public reblogs for a given status (#9850) 2019-01-18 20:58:00 +01:00
reblogs_controller.rb Add visibility param to reblog REST API (#9851) 2019-03-15 04:36:41 +01:00