Thibaut Girka 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.

2019-05-26 15:41:40 +02:00

..

exports

Add CSV export for lists and domain blocks (#9677)

2019-01-01 13:44:04 +01:00

two_factor_authentication

…

applications_controller.rb

…

base_controller.rb

…

deletes_controller.rb

…

exports_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-11 11:23:50 +01:00

featured_tags_controller.rb

Fix pinned statuses being shown in a featured hashtag (#9971)

2019-02-05 00:27:18 +01:00

flavours_controller.rb

…

identity_proofs_controller.rb

Allow turning keybase off instance-wide

2019-04-19 00:57:39 +02:00

imports_controller.rb

…

migrations_controller.rb

…

notifications_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-05-04 16:37:26 +02:00

preferences_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-05-26 15:41:40 +02:00

profiles_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-02-10 21:10:09 +01:00

sessions_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-02-10 21:10:09 +01:00

two_factor_authentications_controller.rb

…