mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-13 06:35:08 +01:00
Code Issues Projects Releases Wiki Activity
ddd875ad99
mastodon/app/controllers/settings
History
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
2019-06-24 15:02:59 +02:00
..
exports Add CSV export for lists and domain blocks (#9677) 2019-01-01 13:44:04 +01:00
preferences Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988) 2019-06-07 16:51:08 +02:00
two_factor_authentication Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
applications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
base_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
deletes_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
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 Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
identity_proofs_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
imports_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
migrations_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
preferences_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +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 Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00