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

Both conflicts are caused by us having extra database columns.
2019-03-05 19:23:16 +01:00
..
activitypub Add specs for activitypub collections controller (#9484) 2018-12-10 21:39:25 +01:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
api Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
auth Merge branch 'master' into glitch-soc/merge-upstream 2019-02-15 18:02:45 +01:00
concerns Improvements to signature verification (#9667) 2019-01-07 21:45:13 +01:00
oauth Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
well_known
about_controller.rb
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +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
directories_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-20 16:49:23 +01: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 Add a per-user setting to hide followers count 2018-12-20 14:51:12 +01:00
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 fix CSP / X-Frame-Options for media embeds (#9558) 2018-12-18 16:40:30 +01:00
media_proxy_controller.rb
remote_follow_controller.rb
remote_interaction_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
remote_unfollows_controller.rb
shares_controller.rb
statuses_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-28 21:35:53 +01:00
stream_entries_controller.rb
tags_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-19 18:28:37 +01:00