mastodon/app/controllers
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
# Conflicts:
#	app/controllers/settings/exports_controller.rb
#	app/models/media_attachment.rb
#	app/models/status.rb
#	app/views/about/show.html.haml
#	docker_entrypoint.sh
#	spec/views/about/show.html.haml_spec.rb
2018-02-23 23:28:31 +09:00
..
activitypub Fix response of signature_verification_failure_reason (#6441) 2018-02-08 05:00:45 +01:00
admin Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
api Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
auth Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
concerns Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225) 2018-02-02 10:19:59 +01:00
oauth
settings Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
well_known
about_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-04 23:17:11 +00:00
application_controller.rb Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
authorize_follows_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-24 19:17:11 +00:00
emojis_controller.rb
follower_accounts_controller.rb
following_accounts_controller.rb
home_controller.rb
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb Save video metadata and improve video OpenGraph tags (#6481) 2018-02-16 07:22:20 +01:00
media_proxy_controller.rb
remote_follow_controller.rb
shares_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-17 16:17:10 +00:00
statuses_controller.rb Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -06:00
stream_entries_controller.rb Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -06:00
tags_controller.rb