diff --git a/.licensed.yml b/.licensed.yml index cd9157732d2..c5903c31e0c 100644 --- a/.licensed.yml +++ b/.licensed.yml @@ -30,6 +30,7 @@ ignored: - strscan # Ruby (default gem) - timeout # Ruby (default gem) - uri # Ruby (default gem) + - mutex_m # BSD-2-Clause reviewed: bundler: @@ -64,3 +65,4 @@ reviewed: - tilt # MIT - unf # BSD-2-Clause - unicorn # Ruby or GPLv2/GPLv3 + - drb # BSD-2-Clause diff --git a/Gemfile b/Gemfile index f73aeecb6ba..bae9d8b9852 100644 --- a/Gemfile +++ b/Gemfile @@ -55,8 +55,6 @@ gem "message_bus" gem "rails_multisite" -gem "fast_xs", platform: :ruby - gem "fastimage" gem "aws-sdk-s3", require: false @@ -199,8 +197,6 @@ gem "puma", require: false gem "rbtrace", require: false, platform: :mri -gem "gc_tracer", require: false, platform: :mri - # required for feed importing and embedding gem "ruby-readability", require: false @@ -269,3 +265,8 @@ gem "net-http" gem "cgi", ">= 0.3.6", require: false gem "tzinfo-data" +gem "csv", require: false + +# TODO: Can be removed once we upgrade to Rails 7.1 +gem "mutex_m" +gem "drb" diff --git a/Gemfile.lock b/Gemfile.lock index 0ae09f3ea28..03817d62fd7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,7 +33,7 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - actionview_precompiler (0.3.0) + actionview_precompiler (0.4.0) actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) @@ -117,6 +117,7 @@ GEM crass (1.0.6) css_parser (1.16.0) addressable + csv (3.3.0) date (3.3.4) debug_inspector (1.2.0) diff-lcs (1.5.0) @@ -130,6 +131,7 @@ GEM faker (~> 2.16) literate_randomizer docile (1.4.0) + drb (2.2.1) email_reply_trimmer (0.1.13) erubi (1.12.0) excon (0.109.0) @@ -146,17 +148,15 @@ GEM faraday-retry (2.2.0) faraday (~> 2.0) fast_blank (1.0.1) - fast_xs (0.8.0) fastimage (2.3.0) ffi (1.16.3) fspath (3.1.2) - gc_tracer (1.5.1) globalid (1.2.1) activesupport (>= 6.1) - google-protobuf (3.25.2-aarch64-linux) - google-protobuf (3.25.2-arm64-darwin) - google-protobuf (3.25.2-x86_64-darwin) - google-protobuf (3.25.2-x86_64-linux) + google-protobuf (3.25.3-aarch64-linux) + google-protobuf (3.25.3-arm64-darwin) + google-protobuf (3.25.3-x86_64-darwin) + google-protobuf (3.25.3-x86_64-linux) guess_html_encoding (0.0.11) hana (1.3.7) hashdiff (1.1.0) @@ -234,6 +234,7 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) mustache (1.1.1) + mutex_m (0.2.0) net-http (0.4.1) uri net-imap (0.4.9.1) @@ -522,6 +523,7 @@ PLATFORMS arm64-darwin-20 arm64-darwin-21 arm64-darwin-22 + arm64-darwin-23 x86_64-darwin-18 x86_64-darwin-19 x86_64-darwin-20 @@ -554,11 +556,13 @@ DEPENDENCIES cose cppjieba_rb css_parser + csv diffy digest discourse-fonts discourse-seed-fu discourse_dev_assets + drb email_reply_trimmer excon execjs @@ -568,9 +572,7 @@ DEPENDENCIES faraday faraday-retry fast_blank - fast_xs fastimage - gc_tracer highline htmlentities http_accept_language @@ -599,6 +601,7 @@ DEPENDENCIES mocha multi_json mustache + mutex_m net-http net-imap net-pop