mastodon/lib/mastodon
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
..
accounts_cli.rb cli: set exit_on_failure for all CLI classes (#9094) 2018-10-25 16:05:33 +02:00
cli_helper.rb tootctl accounts [add|del|cull] (#8642) 2018-09-09 13:33:36 +02:00
emoji_cli.rb cli: set exit_on_failure for all CLI classes (#9094) 2018-10-25 16:05:33 +02:00
feeds_cli.rb cli: set exit_on_failure for all CLI classes (#9094) 2018-10-25 16:05:33 +02:00
media_cli.rb cli: set exit_on_failure for all CLI classes (#9094) 2018-10-25 16:05:33 +02:00
migration_helpers.rb rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00
premailer_webpack_strategy.rb ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372) 2018-01-29 01:06:39 +01:00
redis_config.rb Add support for separate Redis for cache (#7272) 2018-04-27 01:37:59 +02:00
settings_cli.rb cli: set exit_on_failure for all CLI classes (#9094) 2018-10-25 16:05:33 +02:00
snowflake.rb Fixes/do not override timestamps (#7336) 2018-05-03 23:02:46 +02:00
version.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00