This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

David Yip 813da6788e Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: db/schema.rb		2018-04-14 09:12:50 -05: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	Fix data export page error	2018-02-24 00:29:26 +09:00
flavours_controller.rb	Thank you, Officer Murphy	2018-01-10 12:10:43 -06:00
follower_domains_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-13 16:36:46 -05: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 migration page style	2018-03-30 15:26:12 +02: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	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-14 09:12:50 -05: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