mastodon/config
Thibaut Girka 5bb8563f6c Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml

Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.

Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead.
2018-10-26 20:41:43 +02:00
..
environments Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
initializers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2018-10-07 19:47:56 +02:00
application.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
boot.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
brakeman.ignore Add animate custom emoji param to embed pages (#8507) 2018-08-30 23:14:01 +02:00
database.yml use-DB_NAME-in-development (#5430) 2017-10-17 11:45:37 +02:00
deploy.rb Update dependencies for Ruby (2018-04-23) (#7237) 2018-04-23 11:29:17 +02:00
environment.rb Make PreviewCard records reuseable between statuses (#4642) 2017-09-01 16:20:16 +02:00
i18n-tasks.yml Ignore tootsuite-specific theme-related translation strings 2018-05-10 00:03:34 +02:00
navigation.rb Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
puma.rb lint pass 2 (#8878) 2018-10-04 17:38:04 +02:00
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
sidekiq.yml Track historical space stats in PgHero to determine PostgreSQL growth (#8906) 2018-10-09 19:35:14 +02:00
webpacker.yml Fix building assets in test environment 2018-09-13 15:32:02 +02:00