mastodon/app/controllers
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
..
activitypub Fix incoming federation in whitelist mode (#12185) 2019-10-24 22:45:35 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
api Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +02:00
auth Merge branch 'master' into glitch-soc/merge-upstream 2020-02-19 23:04:18 +01:00
concerns Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
oauth Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +02:00
well_known Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
about_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
account_follow_controller.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
account_unfollow_controller.rb
accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-02-19 23:04:18 +01:00
application_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
authorize_interactions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
custom_css_controller.rb Fix redirecting non-functional accounts on public pages (#11978) 2019-09-28 01:33:27 +02:00
directories_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
emojis_controller.rb
filters_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
follower_accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
following_accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
home_controller.rb
instance_actors_controller.rb
intents_controller.rb
invites_controller.rb
manifests_controller.rb Fix redirecting non-functional accounts on public pages (#11978) 2019-09-28 01:33:27 +02:00
media_controller.rb Fix redirecting non-functional accounts on public pages (#11978) 2019-09-28 01:33:27 +02:00
media_proxy_controller.rb Fix redirecting non-functional accounts on public pages (#11978) 2019-09-28 01:33:27 +02:00
public_timelines_controller.rb
relationships_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
remote_follow_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
remote_interaction_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
shares_controller.rb
statuses_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
tags_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-02-09 12:15:55 +01:00