mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-24 01:08:08 +01:00
ce84d163cc
Conflicts: - `.prettierignore`: Upstream added a line at the end, glitch-soc had extra entries at the end. Added upstream's new line before glitch-soc's. - `Gemfile.lock`: Upstream updated dependencies while glitch-soc has an extra one (hcaptcha). Updated dependencies like upstream did. - `app/controllers/api/v1/statuses_controller.rb`: Not a real conflict, upstream added a parameter (`allowed_mentions`) where glitch-soc already had an extra one (`content_type`). Added upstream's new parameter. - `app/javascript/styles/fonts/roboto-mono.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes. - `app/javascript/styles/fonts/roboto.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes. |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
api | ||
auth | ||
concerns | ||
disputes | ||
filters | ||
oauth | ||
settings | ||
well_known | ||
about_controller.rb | ||
accounts_controller.rb | ||
application_controller.rb | ||
authorize_interactions_controller.rb | ||
custom_css_controller.rb | ||
emojis_controller.rb | ||
filters_controller.rb | ||
follower_accounts_controller.rb | ||
following_accounts_controller.rb | ||
health_controller.rb | ||
home_controller.rb | ||
instance_actors_controller.rb | ||
intents_controller.rb | ||
invites_controller.rb | ||
manifests_controller.rb | ||
media_controller.rb | ||
media_proxy_controller.rb | ||
privacy_controller.rb | ||
relationships_controller.rb | ||
shares_controller.rb | ||
statuses_cleanup_controller.rb | ||
statuses_controller.rb | ||
tags_controller.rb |