alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/controllers
History
Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
 		2019-07-23 10:51:07 +02:00
..
activitypub Add (back) rails-level JSON caching (#11333) 2019-07-21 22:32:16 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 23:37:41 +02:00
api Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
auth Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
concerns Add (back) rails-level JSON caching (#11333) 2019-07-21 22:32:16 +02:00
oauth Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
well_known Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
about_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
account_follow_controller.rb
…
account_unfollow_controller.rb
…
accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
application_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
authorize_interactions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
custom_css_controller.rb Fix custom CSS controller (#11336) 2019-07-17 17:14:25 +02:00
directories_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 16:02:54 +01:00
emojis_controller.rb Add (back) rails-level JSON caching (#11333) 2019-07-21 22:32:16 +02:00
filters_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
follower_accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
following_accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
home_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
instance_actors_controller.rb Add ActivityPub actor representing the entire server (#11321) 2019-07-19 01:44:42 +02:00
intents_controller.rb Refactor controllers for statuses, accounts, and more (#11249) 2019-07-08 12:03:45 +02:00
invites_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
manifests_controller.rb Refactor controllers for statuses, accounts, and more (#11249) 2019-07-08 12:03:45 +02:00
media_controller.rb Refactor controllers for statuses, accounts, and more (#11249) 2019-07-08 12:03:45 +02:00
media_proxy_controller.rb Change domain blocks to automatically support subdomains (#11138) 2019-06-22 00:13:10 +02:00
public_timelines_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
relationships_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
remote_follow_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
remote_interaction_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
shares_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
statuses_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
tags_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00