DEV: Move back to web-push gem (#19849)

Our fork was needed for OpenSSL 3 and Ruby 2.X compatibility.

The OpenSSL 3 part was merged into the gem for version 3.

Discourse dropped support for Ruby 2.X.

That means we don't need our fork anymore.
This commit is contained in:
Rafael dos Santos Silva 2023-01-12 12:12:19 -03:00 committed by GitHub
parent ab9ea50917
commit 192d8c25e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 16 deletions

View File

@ -261,12 +261,7 @@ if ENV["IMPORT"] == "1"
gem "parallel", require: false gem "parallel", require: false
end end
# workaround for openssl 3.0, see gem "web-push"
# https://github.com/pushpad/web-push/pull/2
gem "web-push",
require: false,
git: "https://github.com/xfalcox/web-push",
branch: "openssl-3-compat"
gem "colored2", require: false gem "colored2", require: false
gem "maxminddb" gem "maxminddb"

View File

@ -5,15 +5,6 @@ GIT
mail (2.8.0.edge) mail (2.8.0.edge)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
GIT
remote: https://github.com/xfalcox/web-push
revision: 369df8f475a4cd4832a7679bec16576665f24d24
branch: openssl-3-compat
specs:
web-push (2.1.0)
hkdf (~> 1.0)
jwt (~> 2.0)
openssl (~> 3.0)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
@ -483,6 +474,10 @@ GEM
uri (0.12.0) uri (0.12.0)
uri_template (0.7.0) uri_template (0.7.0)
version_gem (1.1.1) version_gem (1.1.1)
web-push (3.0.0)
hkdf (~> 1.0)
jwt (~> 2.0)
openssl (~> 3.0)
webdrivers (5.2.0) webdrivers (5.2.0)
nokogiri (~> 1.6) nokogiri (~> 1.6)
rubyzip (>= 1.3.0) rubyzip (>= 1.3.0)
@ -638,7 +633,7 @@ DEPENDENCIES
uglifier uglifier
unf unf
unicorn unicorn
web-push! web-push
webdrivers webdrivers
webmock webmock
webrick webrick