mastodon/app
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
..
chewy Fix bookmarks also searchable (#13293) 2020-03-22 02:40:03 +01:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00
mailers Fix error when sending moderation notification (#13014) 2020-02-01 15:42:12 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-11-30 17:29:44 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +02:00
validators Improve polls: option lengths & redesign (#13257) 2020-04-02 17:10:55 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +02:00