mastodon/app
Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.
2018-12-18 16:55:15 +01:00
..
chewy Get rid of Chewy order/limit warning (#8355) 2018-08-22 02:44:56 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
mailers Fix low-hanging rubocop gripes (#8458) 2018-08-26 19:22:46 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2018-11-29 19:22:52 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
workers Do no retry web push workers if the server returns a 4xx response (#9434) 2018-12-17 03:14:13 +01:00