tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Mastodon/app/controllers
History
Claire e855df149b Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.
2021-10-25 20:28:51 +02:00
..
activitypub
Merge branch 'main' into glitch-soc/merge-upstream
2021-09-19 13:07:27 +02:00
admin
Merge branch 'main' into glitch-soc/merge-upstream
2021-10-14 21:44:57 +02:00
api
Merge branch 'main' into glitch-soc/merge-upstream
2021-10-25 20:28:51 +02:00
auth
Merge branch 'main' into glitch-soc/merge-upstream
2021-09-30 11:45:13 +02:00
concerns
Merge branch 'main' into glitch-soc/merge-upstream
2021-08-27 11:29:03 +02:00
oauth
…
settings
Merge branch 'main' into glitch-soc/merge-upstream
2021-08-27 11:29:03 +02:00
well_known
Merge branch 'main' into glitch-soc/merge-upstream
2021-07-08 16:17:19 +02:00
about_controller.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-02-22 15:23:46 +01:00
account_follow_controller.rb
…
account_unfollow_controller.rb
…
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-07-25 12:48:48 +02:00
authorize_interactions_controller.rb
…
custom_css_controller.rb
Remove set-cookie header on custom.css (#16314)
2021-05-30 17:57:47 +02:00
directories_controller.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-07 18:21:59 +02:00
emojis_controller.rb
…
filters_controller.rb
…
follower_accounts_controller.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-23 10:46:24 +02:00
following_accounts_controller.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-23 10:46:24 +02:00
health_controller.rb
Change health check (#15988)
2021-04-03 02:39:04 +02:00
home_controller.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-09-26 18:28:59 +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
…
invites_controller.rb
…
manifests_controller.rb
…
media_controller.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-10-13 15:50:24 +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
…
relationships_controller.rb
…
remote_follow_controller.rb
…
remote_interaction_controller.rb
…
shares_controller.rb
…
statuses_cleanup_controller.rb
Fix account statuses cleanup settings controller for glitch-soc's theming system
2021-08-09 23:28:06 +02:00
statuses_controller.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-07 18:21:59 +02:00
tags_controller.rb
…