monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/controllers
History
Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
 		2024-10-26 13:38:07 +02:00
..
activitypub Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
admin Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 2024-10-06 16:07:58 +02:00
api Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 2024-10-26 13:38:07 +02:00
auth Move non-action public method controller callback to private methods (#31933) 2024-09-18 08:05:25 +00:00
concerns Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 2024-10-26 13:38:07 +02:00
disputes Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
filters Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
oauth Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
redirect Move redirect/base body class to view (#31796) 2024-09-12 13:31:50 +00:00
settings Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 2024-10-06 16:07:58 +02:00
well_known Support /.well-known/host-meta.json (#32206) 2024-10-02 09:23:44 +00:00
about_controller.rb
…
accounts_controller.rb Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream 2024-05-16 19:30:10 +02:00
application_controller.rb Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00
authorize_interactions_controller.rb
…
backups_controller.rb
…
custom_css_controller.rb
…
emojis_controller.rb
…
filters_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
follower_accounts_controller.rb
…
following_accounts_controller.rb
…
health_controller.rb
…
home_controller.rb
…
instance_actors_controller.rb
…
intents_controller.rb
…
invites_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
mail_subscriptions_controller.rb Fix contrast between background and form elements on some pages (#31266) 2024-08-02 13:55:31 +00:00
manifests_controller.rb
…
media_controller.rb Add coverage for `media#player`, move body class to view (#31790) 2024-09-06 16:46:25 +00:00
media_proxy_controller.rb Add `OpenSSL::SSL::SSLError` to http connection errors wrapper (#32307) 2024-10-08 14:59:51 +00:00
privacy_controller.rb
…
relationships_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
remote_interaction_helper_controller.rb
…
severed_relationships_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
shares_controller.rb Move shares/modal body class to layout (#31789) 2024-09-06 16:46:55 +00:00
statuses_cleanup_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
statuses_controller.rb Remove unused `statuses#embed` body class assignment (#31787) 2024-09-12 13:38:15 +00:00
tags_controller.rb Rename `cache_*` methods to `preload_*` in controller concern (#30209) 2024-05-16 08:03:46 +00:00