mastodon/app
Thibaut Girka a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
2019-04-22 20:40:04 +02:00
..
chewy Add type, limit, offset, min_id, max_id, account_id to search API (#10091) 2019-02-26 15:21:36 +01:00
controllers Fix keybase indication on dashboard 2019-04-19 00:57:39 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02:00
mailers Fix error in AdminMailer#new_pending_account (#10264) 2019-03-14 14:20:22 +01:00
models Allow turning keybase off instance-wide 2019-04-19 00:57:39 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00