mastodon/app/controllers
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb

Resolved by taking both changes (not a real conflict, just changes too close
to each other).
2018-11-27 13:23:02 +01:00
..
activitypub Allow inbox owner to view implicitly targeted ActivityPub payload (#9093) 2018-10-25 18:12:22 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
api Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
auth Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 17:52:08 +01:00
concerns Reduce connect timeout limit and limit signature failures by source IP (#9236) 2018-11-08 21:35:58 +01:00
oauth Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
well_known
about_controller.rb
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb Exclude local-only toots from atom feeds 2018-11-13 18:55:57 +01:00
application_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
authorize_interactions_controller.rb
custom_css_controller.rb Add admin custom CSS setting (#8399) 2018-08-24 04:33:27 +02:00
emojis_controller.rb
filters_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
follower_accounts_controller.rb
following_accounts_controller.rb
home_controller.rb
intents_controller.rb
invites_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
manifests_controller.rb
media_controller.rb
media_proxy_controller.rb
remote_follow_controller.rb
remote_interaction_controller.rb
remote_unfollows_controller.rb
shares_controller.rb
statuses_controller.rb Set Content-Security-Policy rules through RoR's config (#8957) 2018-10-11 20:35:46 +02:00
stream_entries_controller.rb
tags_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-11-06 15:22:44 +01:00