mastodon/app/lib
Claire a6147a831f Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/themes.rb`
- `app/views/layouts/application.html.haml`
- `app/views/layouts/embedded.html.haml`
- `app/views/layouts/error.html.haml`
- `config/settings.yml`

All these conflicts are because glitch-soc and upstream have different theming
systems and upstream changed a few things to have dynamic theme selection based
on system settings.

Conflicts were solved to take that into account, and `current_theme` has been
changed in the process to return a tuple of `[flavour, skin]` to be used in
the `theme_style_tags` helper.
2024-05-01 14:25:47 +02:00
..
activitypub Merge pull request from GHSA-3fjr-858r-92rw 2024-02-01 15:57:08 +01:00
admin Use full snowflake range in `admin/metrics` classes (#29416) 2024-03-13 08:56:37 +00:00
annual_report Add annual reports for accounts (#28693) 2024-01-24 09:38:10 +00:00
connection_pool
importer
node_info
ostatus Fix `Style/RedundantReturn` cop (#28391) 2023-12-18 09:50:51 +00:00
rss
translation_service
vacuum Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream 2024-01-25 19:51:19 +01:00
webhooks
access_token_extension.rb
account_reach_finder.rb
account_statuses_filter.rb Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 2023-12-20 22:05:31 +01:00
activity_tracker.rb Use inclusive range in `ActivityTracker#get` (#29413) 2024-03-14 21:21:01 +00:00
advanced_text_formatter.rb
annual_report.rb Add annual reports for accounts (#28693) 2024-01-24 09:38:10 +00:00
application_extension.rb Merge pull request from GHSA-7w3c-p9j8-mq3x 2024-02-14 15:25:15 +01:00
ascii_folding.rb
attachment_batch.rb Disable `Rails/SkipsModelValidations` cop (#28712) 2024-01-15 13:46:47 +00:00
cache_buster.rb
content_security_policy.rb Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 2024-01-10 17:51:12 +01:00
delivery_failure_tracker.rb Fix `Rails/WhereExists` cop in app/lib (#28862) 2024-01-24 11:51:09 +00:00
emoji_formatter.rb Remove unused `EmojiFormatter#count_tag_nesting` method (#28643) 2024-01-08 13:36:47 +00:00
entity_cache.rb
extractor.rb
fast_geometry_parser.rb
fast_ip_map.rb
feed_manager.rb Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00
hashtag_normalizer.rb
html_aware_formatter.rb
inline_renderer.rb Fix N+1s because of association preloaders not actually getting called (#28339) 2023-12-13 07:47:32 +00:00
link_details_extractor.rb Fix error when processing link preview with an array as `inLanguage` (#28252) 2023-12-07 09:05:08 +00:00
permalink_redirector.rb Add confirmation when redirecting logged-out requests to permalink (#27792) 2024-01-24 10:49:19 +00:00
plain_text_formatter.rb
rate_limiter.rb
redis_configuration.rb
request.rb Fix Mastodon not correctly processing HTTP Signatures with query strings (#28476) 2024-01-03 11:29:26 +00:00
request_pool.rb
response_with_limit.rb
scope_parser.rb
scope_transformer.rb
search_query_parser.rb
search_query_transformer.rb
signature_parser.rb Rewrite signature verification using regexps and `StringScanner` (#29133) 2024-02-07 17:24:42 +00:00
status_cache_hydrator.rb Fix `Rails/WhereExists` cop in app/lib/status_cache_hydrator (#28808) 2024-01-19 09:19:48 +00:00
status_filter.rb
status_finder.rb
status_reach_finder.rb Fix Undo Announce activity is not sent, when not followed by the reblogged post author (#18482) 2024-01-12 15:58:28 +00:00
suspicious_sign_in_detector.rb Fix `Rails/WhereExists` cop in app/lib (#28862) 2024-01-24 11:51:09 +00:00
tag_manager.rb
text_formatter.rb Use rails built-in `tag` methods in `TextFormatter.shortened_link` (#28976) 2024-03-13 09:19:54 +00:00
themes.rb Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream 2024-05-01 14:25:47 +02:00
translation_service.rb
user_settings_serializer.rb
vacuum.rb
validation_error_formatter.rb
video_metadata_extractor.rb
webfinger.rb
webfinger_resource.rb