hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/lib
History
Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.
 		2022-10-02 18:46:22 +02:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
admin Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
connection_pool
…
importer Fix ambiguous column names in `tootctl search deploy` (#18993) 2022-08-17 22:07:12 +01:00
nodeinfo
…
ostatus
…
rss Fix errors when rendering RSS feeds (#18531) 2022-05-26 23:02:42 +02:00
settings Merge branch 'main' into glitch-soc/merge-upstream 2021-03-24 10:53:50 +01:00
translation_service Fix auto detect language for translate service (#19244) 2022-09-27 23:33:56 +02:00
vacuum Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
access_token_extension.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02: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
advanced_text_formatter.rb Fix leading spaces being stripped in Markdown code blocks 2022-05-24 10:24:59 +02:00
application_extension.rb Fix confirmation redirect to app without `Location` header (#18523) 2022-05-26 22:03:54 +02:00
ascii_folding.rb Change how hashtags are normalized (#18795) 2022-07-13 15:03:28 +02:00
cache_buster.rb Add cache buster feature for media files (#15155) 2020-11-19 17:38:06 +01:00
delivery_failure_tracker.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
emoji_formatter.rb Change RSS feeds (#18356) 2022-05-09 07:43:08 +02:00
entity_cache.rb Fix cache_collection crashing when given an empty collection (#15921) 2021-03-18 00:41:32 +01:00
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 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-10-02 18:46:22 +02:00
hash_object.rb
…
hashtag_normalizer.rb Change how hashtags are normalized (#18795) 2022-07-13 15:03:28 +02:00
html_aware_formatter.rb Add advanced text formatting back into glitch-soc 2022-03-28 22:21:37 +02:00
inline_renderer.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
link_details_extractor.rb Add workaround for YouTube Shorts links (#17869) 2022-03-25 19:31:35 +01:00
permalink_redirector.rb Add logged-out access to the web UI (#18961) 2022-09-29 04:39:33 +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 Add rate limit for reporting (#13390) 2020-04-05 14:40:08 +02:00
redis_configuration.rb Add retention policy for cached content and media (#19232) 2022-09-27 03:08:19 +02:00
request.rb Refactor ActivityPub handling to prepare for non-Account actors (#19212) 2022-09-21 22:45:57 +02:00
request_pool.rb
…
response_with_limit.rb Fix remote files not using Content-Type header, streaming (#14184) 2020-06-30 23:58:02 +02:00
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 Fix error resposes for `from` search prefix (#17963) 2022-04-08 21:21:49 +02: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
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 Fix TagManager#local_url? erroring out on invalid URL (#18580) 2022-05-31 18:25:24 +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
…
translation_service.rb Add user content translations with configurable backends (#19218) 2022-09-23 23:00:12 +02:00
user_settings_decorator.rb Various code cleanup (#1782) 2022-05-25 12:27:11 +02:00
vacuum.rb Add retention policy for cached content and media (#19232) 2022-09-27 03:08:19 +02: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 Improve error reporting and logging when processing remote accounts (#15605) 2022-09-20 23:30:26 +02:00
webfinger_resource.rb Fix webfinger returning wrong status code on malformed or missing param (#13759) 2020-05-14 23:28:06 +02:00