FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/lib
History
Claire ff73d43b35 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `app/controllers/settings/preferences_controller.rb`:
  Upstream added settings where we had extra glitch-soc-specific settings.
  Added upstream's new settings.
- `app/models/user.rb`:
  Upstream added settings where we had extra glitch-soc-specific settings.
  Added upstream's new settings.
- `config/i18n-tasks.yml`:
  Not a real conflict, just a new upstream line too textually close to
  a glitch-soc-only line.
  Ported upstream's change.
 		2022-04-08 19:53:32 +02: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
…
access_token_extension.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
account_reach_finder.rb
…
activity_tracker.rb
…
advanced_text_formatter.rb Fix code blocks processing 2022-03-28 23:40:45 +02:00
application_extension.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
cache_buster.rb
…
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
…
extractor.rb Fix being able to post URLs longer than 4096 characters (#17908) 2022-03-30 14:46:03 +02:00
fast_geometry_parser.rb
…
fast_ip_map.rb
…
feed_manager.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-31 10:36:23 +02:00
hash_object.rb
…
html_aware_formatter.rb Add advanced text formatting back into glitch-soc 2022-03-28 22:21:37 +02: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
…
plain_text_formatter.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
potential_friendship_tracker.rb
…
rate_limiter.rb
…
request.rb
…
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
…
suspicious_sign_in_detector.rb Remove sign-in token authentication, instead send e-mail about new sign-in (#17970) 2022-04-06 20:58:12 +02:00
tag_manager.rb
…
text_formatter.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
themes.rb
…
toc_generator.rb
…
user_settings_decorator.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-04-08 19:53:32 +02:00
validation_error_formatter.rb
…
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
…
webfinger_resource.rb
…