mastodon/app/lib
Claire aaa9ec340b Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/formatter.rb`:
  Upstream completely refactored the formatting code and removed that file,
  while glitch-soc had code for Markdown and HTML toots.
  Took upstream code, glitch-soc changes will be re-implemented on top of the
  refactored classes in a later commit.
- `app/models/status.rb`:
  Upstream refactored status edit handling and moved code to
  `app/models/concerns/status_snapshot_concern.rb`.
  Applied glitch-soc's changes to that file.
- `app/serializers/activitypub/note_serializer.rb`:
  Not really a conflict, just a line added too close to one modified by
  glitch-soc.
  Applied upstream changes while keeping the glitch-soc-modified one.
- `app/services/update_status_service.rb`:
  Not really a conflict, upstream modified a line adjacent to one added by
  glitch-soc.
  Applied upstream changes while keeping the glitch-soc line.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream refactored formatting, glitch-soc changed the markup slightly.
  Applied upstream changes.
- `spec/lib/formatter_spec.rb`:
  Upstream completely refactored the formatting code and removed that file,
  while glitch-soc had code for Markdown and HTML toots.
  Took upstream code, glitch-soc changes will be re-implemented on top of the
  refactored classes in a later commit.
2022-03-26 19:18:55 +01:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01:00
admin Add admin dashboard checks for Elasticsearch version (#17863) 2022-03-25 21:00:59 +01:00
connection_pool
nodeinfo
ostatus
rss Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
settings Merge branch 'main' into glitch-soc/merge-upstream 2021-03-24 10:53:50 +01:00
access_token_extension.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
account_reach_finder.rb Fix remote reporters not receiving suspend/unsuspend activities (#16050) 2021-04-17 14:55:46 +02:00
activity_tracker.rb Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 20:44:59 +02:00
application_extension.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
cache_buster.rb Add cache buster feature for media files (#15155) 2020-11-19 17:38:06 +01:00
delivery_failure_tracker.rb Change design of federation pages in admin UI (#17704) 2022-03-09 08:52:32 +01:00
emoji_formatter.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
entity_cache.rb Fix cache_collection crashing when given an empty collection (#15921) 2021-03-18 00:41:32 +01:00
extractor.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
fast_geometry_parser.rb Switch from unmaintained paperclip to kt-paperclip (#16724) 2021-09-29 23:52:36 +02:00
fast_ip_map.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
feed_manager.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01:00
hash_object.rb
html_aware_formatter.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
inline_renderer.rb
link_details_extractor.rb Add workaround for YouTube Shorts links (#17869) 2022-03-25 19:31:35 +01:00
permalink_redirector.rb Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
plain_text_formatter.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
potential_friendship_tracker.rb Change auto-following admin-selected accounts, show in recommendations (#16078) 2021-04-24 17:01:43 +02:00
rate_limiter.rb
request.rb Add support for structured data and more OpenGraph tags to link cards (#16938) 2021-11-05 23:23:05 +01:00
request_pool.rb
response_with_limit.rb
rss_builder.rb
scope_parser.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
scope_transformer.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
search_query_parser.rb
search_query_transformer.rb Add from: query operator to search syntax (#16526) 2022-02-14 00:17:09 +01:00
status_filter.rb
status_finder.rb
status_reach_finder.rb Add support for editing for published statuses (#16697) 2022-01-19 22:37:27 +01:00
tag_manager.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
text_formatter.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
themes.rb Refactor theme config loading 2022-01-16 22:26:18 +01:00
toc_generator.rb
user_settings_decorator.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
validation_error_formatter.rb Add details to error response for POST /api/v1/accounts in REST API (#15803) 2021-03-01 04:59:13 +01:00
video_metadata_extractor.rb Fix some media attachments being converted with too high framerates (#17619) 2022-02-22 17:11:22 +01:00
webfinger.rb Fix confusing error when webfinger request returns empty document (#16986) 2021-11-14 21:55:40 +01:00
webfinger_resource.rb