github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 12:12:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Always use non-builtin net-* and digest gems (#18560)

Browse Source 
This will possibly fix the issue we're having with Dependabot. It seems it now uses a different ruby version (i.e. 3.1+)
This commit is contained in:
Jarek Radosz 2022-10-12 15:22:22 +02:00 committed by GitHub
parent 33087f0bdf
commit b5005e3574
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Gemfile
View File

@ -134,13 +134,10 @@ gem 'cose', require: false
gem 'addressable' gem 'addressable'
gem 'json_schemer' gem 'json_schemer'
if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1") gem "net-smtp", require: false
# net-smtp, net-imap and net-pop were removed from default gems in Ruby 3.1 gem "net-imap", require: false
gem "net-smtp", "~> 0.2.1", require: false gem "net-pop", require: false
gem "net-imap", "~> 0.2.1", require: false gem "digest", require: false
gem "net-pop", "~> 0.1.1", require: false
gem "digest", "3.0.0", require: false
end
# Gems used only for assets and not required in production environments by default. # Gems used only for assets and not required in production environments by default.
# Allow everywhere for now cause we are allowing asset debugging in production # Allow everywhere for now cause we are allowing asset debugging in production

5
Gemfile.lock
View File

@ -118,6 +118,7 @@ GEM
debug_inspector (1.1.0) debug_inspector (1.1.0)
diff-lcs (1.5.0) diff-lcs (1.5.0)
diffy (3.4.2) diffy (3.4.2)
digest (3.1.0)
discourse-ember-rails (0.18.6) discourse-ember-rails (0.18.6)
active_model_serializers active_model_serializers
ember-data-source (>= 1.0.0.beta.5) ember-data-source (>= 1.0.0.beta.5)
@ -542,6 +543,7 @@ DEPENDENCIES
cppjieba_rb cppjieba_rb
css_parser css_parser
diffy diffy
digest
discourse-ember-rails (= 0.18.6) discourse-ember-rails (= 0.18.6)
discourse-ember-source (~> 3.12.2) discourse-ember-source (~> 3.12.2)
discourse-fonts discourse-fonts
@ -588,6 +590,9 @@ DEPENDENCIES
multi_json multi_json
mustache mustache
net-http net-http
net-imap
net-pop
net-smtp
nokogiri nokogiri
oj (= 3.13.14) oj (= 3.13.14)
omniauth omniauth