monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/controllers
History
Claire c118918520 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/custom_emoji.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific validation.
  Applied upstream changes.
- `app/models/public_feed.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific parameter documentation.
  Applied upstream changes.
 		2022-11-10 09:36:47 +01:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
api Merge branch 'main' into glitch-soc/merge-upstream 2022-11-10 09:36:47 +01:00
auth Merge branch 'main' into glitch-soc/merge-upstream 2022-11-07 19:53:30 +01:00
concerns Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
disputes
…
filters
…
oauth
…
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
well_known
…
about_controller.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
accounts_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
application_controller.rb
…
authorize_interactions_controller.rb
…
custom_css_controller.rb
…
emojis_controller.rb
…
filters_controller.rb
…
follower_accounts_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
following_accounts_controller.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
health_controller.rb
…
home_controller.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
instance_actors_controller.rb
…
intents_controller.rb
…
invites_controller.rb
…
manifests_controller.rb
…
media_controller.rb
…
media_proxy_controller.rb
…
privacy_controller.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
relationships_controller.rb
…
shares_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
statuses_cleanup_controller.rb
…
statuses_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
tags_controller.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00