mastodon/app/controllers
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
..
activitypub move outbox filtering to Status#permitted_for (as per @ekiru) 2017-12-11 15:28:04 -06:00
admin Merge remote-tracking branch 'origin/master' into merge-upstream 2017-12-30 17:20:07 -06:00
api Merge remote-tracking branch 'origin/master' into merge-upstream 2017-12-30 17:20:07 -06:00
auth Merge remote-tracking branch 'origin/master' into merge-upstream 2017-12-30 17:20:07 -06:00
concerns Add more instance stats APIs (#6125) 2017-12-29 19:52:04 +01:00
oauth change pack to 'auth' 2017-12-11 18:14:41 -06:00
settings Set packs on 2FA-related pages. Fixes #271. 2017-12-20 03:15:54 -06:00
well_known Make host_meta/webfinger replies cacheable (fixes #6100) (#6101) 2017-12-27 18:21:12 +01:00
about_controller.rb
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb filter local-only statuses from public pages 2017-12-10 17:23:01 -06:00
application_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2017-12-30 17:20:07 -06:00
authorize_follows_controller.rb
emojis_controller.rb
follower_accounts_controller.rb
following_accounts_controller.rb
home_controller.rb
intents_controller.rb
invites_controller.rb Use settings pack for InvitesController (#229) 2017-12-06 17:20:04 -06:00
manifests_controller.rb
media_controller.rb
media_proxy_controller.rb
remote_follow_controller.rb
shares_controller.rb
statuses_controller.rb
stream_entries_controller.rb
tags_controller.rb