David Yip 020b40efdb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml		2018-02-09 09:25:53 -06:00
..
exports	Remove exports/base controller in favor of shared concern (#3444)	2017-05-30 19:06:01 +02:00
two_factor_authentication	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-21 13:36:10 -06:00
applications_controller.rb	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
base_controller.rb	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
deletes_controller.rb	Prepend check_enabled_deletion to Settings::DeletesController (#229)	2017-12-06 16:19:43 -06:00
exports_controller.rb	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
flavours_controller.rb	Thank you, Officer Murphy	2018-01-10 12:10:43 -06:00
follower_domains_controller.rb	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
imports_controller.rb	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
keyword_mutes_controller.rb	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
migrations_controller.rb	Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)	2017-12-14 21:35:30 +01:00
notifications_controller.rb	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
preferences_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-09 09:25:53 -06:00
profiles_controller.rb	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
sessions_controller.rb	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
two_factor_authentications_controller.rb	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00