tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers
History
Claire 10a31a934f Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream's README got updated, but we have a completely different one.
  Kept ours.
2021-05-27 17:58:44 +02:00
..
activitypub
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-07 18:21:59 +02:00
admin
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-07 18:21:59 +02:00
api
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-07 18:21:59 +02:00
auth
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-07 18:21:59 +02:00
concerns
Merge branch 'main' into glitch-soc/merge-upstream
2021-03-19 13:57:15 +01:00
oauth
Merge branch 'master' into glitch-soc/merge-upstream
2020-09-28 14:13:30 +02:00
settings
Merge branch 'master' into glitch-soc/merge-upstream
2021-01-06 18:08:06 +01:00
well_known
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-08 14:20:35 +01:00
about_controller.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-02-22 15:23:46 +01:00
account_follow_controller.rb
Add specific rate limits for posting and following (#13172)
2020-03-08 15:17:39 +01:00
account_unfollow_controller.rb
Restful refactor of accounts/ routes (#2133)
2017-04-19 13:52:37 +02:00
accounts_controller.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-07 18:21:59 +02:00
application_controller.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-07 18:21:59 +02:00
authorize_interactions_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-03-08 19:38:53 +01:00
custom_css_controller.rb
Fix redirecting non-functional accounts on public pages (#11978)
2019-09-28 01:33:27 +02:00
directories_controller.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-07 18:21:59 +02: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
2020-11-03 17:28:54 +01:00
follower_accounts_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-08 14:20:35 +01:00
following_accounts_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-08 14:20:35 +01:00
health_controller.rb
Change health check (#15988)
2021-04-03 02:39:04 +02:00
home_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-07 15:58:45 +02:00
instance_actors_controller.rb
Create instance actor if it hasn't been properly seeded (#15693)
2021-02-09 18:12:54 +01: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
2019-08-19 21:49:35 +02:00
manifests_controller.rb
Fix redirecting non-functional accounts on public pages (#11978)
2019-09-28 01:33:27 +02:00
media_controller.rb
Fix embedded player
2020-08-12 00:00:42 +02:00
media_proxy_controller.rb
Fix media proxy RedisLocks auto-releasing too fast (#16291)
2021-05-22 15:00:33 +02:00
public_timelines_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
relationships_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-12 22:13:57 +01:00
remote_follow_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
remote_interaction_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-06-24 15:33:41 +02:00
shares_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
statuses_controller.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-07 18:21:59 +02:00
tags_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-09-08 16:26:47 +02:00