mastodon/app/controllers/api
Thibaut Girka f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `app/validators/poll_validator.rb`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream added a rule, the way we compute ours is different, but
  that added rule has been ported.
- `package.json`:
  No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
  No real conflict, dependency update. Performed the same update.
2020-04-02 20:32:00 +02:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +02:00
v2 Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
web Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
base_controller.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
oembed_controller.rb Fix OEmbed leaking information about existence of non-public statuses (#12930) 2020-01-24 00:20:51 +01:00
proofs_controller.rb Fix proofs API being inaccessible in secure mode (#12495) 2019-11-28 04:07:49 +01:00