Skip to content

Commit

Permalink
Merge pull request #317 from activemerchant/fix-cve
Browse files Browse the repository at this point in the history 
Fix cve
  • Loading branch information
Pierre Nespo authored Apr 26, 2019
2 parents 21812e1 + ae85bfa commit e331582
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 64 deletions.
127 changes: 68 additions & 59 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,68 +2,73 @@ PATH
remote: .
specs:
offsite_payments (2.7.11)
actionpack (>= 3.2.20, < 6.0)
actionpack (>= 5.2.3)
actionview (>= 5.1.6.2)
active_utils (~> 3.3.0)
activesupport (>= 3.2.14)
activesupport (>= 5.2.3)
builder (>= 2.1.2, < 4.0.0)
i18n (>= 0.6.6)
nokogiri (~> 1.6)
nokogiri (>= 1.8.5)

GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.5)
actionpack (= 5.1.5)
actioncable (5.2.3)
actionpack (= 5.2.3)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.5)
actionpack (= 5.1.5)
actionview (= 5.1.5)
activejob (= 5.1.5)
websocket-driver (>= 0.6.1)
actionmailer (5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.5)
actionview (= 5.1.5)
activesupport (= 5.1.5)
actionpack (5.2.3)
actionview (= 5.2.3)
activesupport (= 5.2.3)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.5)
activesupport (= 5.1.5)
actionview (5.2.3)
activesupport (= 5.2.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
active_utils (3.3.12)
activesupport (>= 3.2, < 6.0)
active_utils (3.3.16)
activesupport (>= 4.2)
i18n
activejob (5.1.5)
activesupport (= 5.1.5)
activejob (5.2.3)
activesupport (= 5.2.3)
globalid (>= 0.3.6)
activemodel (5.1.5)
activesupport (= 5.1.5)
activerecord (5.1.5)
activemodel (= 5.1.5)
activesupport (= 5.1.5)
arel (~> 8.0)
activesupport (5.1.5)
activemodel (5.2.3)
activesupport (= 5.2.3)
activerecord (5.2.3)
activemodel (= 5.2.3)
activesupport (= 5.2.3)
arel (>= 9.0)
activestorage (5.2.3)
actionpack (= 5.2.3)
activerecord (= 5.2.3)
marcel (~> 0.3.1)
activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
arel (8.0.0)
arel (9.0.0)
builder (3.2.3)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.5)
crass (1.0.4)
daemons (1.0.10)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
erubi (1.7.0)
erubi (1.8.0)
gem_plugin (0.2.3)
globalid (0.4.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
Expand All @@ -74,8 +79,10 @@ GEM
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
mechanize (2.7.5)
domain_name (~> 0.5, >= 0.5.1)
http-cookie (~> 1.0)
Expand All @@ -86,12 +93,13 @@ GEM
ntlm-http (~> 0.1, >= 0.1.1)
webrobots (>= 0.0.9, < 0.2)
metaclass (0.0.4)
method_source (0.9.0)
method_source (0.9.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
mocha (1.3.0)
metaclass (~> 0.0.1)
Expand All @@ -102,39 +110,40 @@ GEM
gem_plugin (~> 0.2.3)
net-http-digest_auth (1.4.1)
net-http-persistent (2.9.4)
nio4r (2.2.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
nio4r (2.3.1)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
ntlm-http (0.1.1)
power_assert (1.1.1)
public_suffix (3.0.2)
rack (2.0.6)
rack-test (0.8.3)
rack (2.0.7)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.1.5)
actioncable (= 5.1.5)
actionmailer (= 5.1.5)
actionpack (= 5.1.5)
actionview (= 5.1.5)
activejob (= 5.1.5)
activemodel (= 5.1.5)
activerecord (= 5.1.5)
activesupport (= 5.1.5)
rails (5.2.3)
actioncable (= 5.2.3)
actionmailer (= 5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
activemodel (= 5.2.3)
activerecord (= 5.2.3)
activestorage (= 5.2.3)
activesupport (= 5.2.3)
bundler (>= 1.3.0)
railties (= 5.1.5)
railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.3)
railties (5.1.5)
actionpack (= 5.1.5)
activesupport (= 5.1.5)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.0)
thor (>= 0.19.0, < 2.0)
rake (12.3.2)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
Expand All @@ -144,15 +153,15 @@ GEM
sprockets (>= 3.0.0)
test-unit (3.2.7)
power_assert
thor (0.20.0)
thor (0.20.3)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
webrobots (0.1.2)
websocket-driver (0.6.5)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)

Expand All @@ -173,4 +182,4 @@ DEPENDENCIES
thor

BUNDLED WITH
1.17.1
1.17.3
2 changes: 1 addition & 1 deletion gemfiles/Gemfile.rails50
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ group :remote_test do
gem 'mongrel', '1.2.0.pre2', :platforms => :ruby
end

gem 'actionpack', '~> 5.0.0'
gem 'actionpack', '>= 5.2.3'
gem 'money', '~> 6.8'
2 changes: 1 addition & 1 deletion gemfiles/Gemfile.shopify
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ group :remote_test do
gem 'mongrel', '1.2.0.pre2', :platforms => :ruby
end

gem 'actionpack', '~> 5.0.0'
gem 'actionpack', '>= 5.2.3'
gem 'shopify-money', require: 'money'
7 changes: 4 additions & 3 deletions offsite_payments.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,13 @@ Gem::Specification.new do |s|
}
end

s.add_dependency('activesupport', '>= 3.2.14')
s.add_dependency('activesupport', '>= 5.2.3')
s.add_dependency('i18n', '>= 0.6.6')
s.add_dependency('builder', '>= 2.1.2', '< 4.0.0')
s.add_dependency('active_utils', '~> 3.3.0')
s.add_dependency('nokogiri', "~> 1.6")
s.add_dependency('actionpack', '>= 3.2.20')
s.add_dependency('nokogiri', ">= 1.8.5")
s.add_dependency('actionpack', '>= 5.2.3')
s.add_dependency('actionview','>= 5.1.6.2')

s.add_development_dependency('rake')
s.add_development_dependency('test-unit', '~> 3.0')
Expand Down

0 comments on commit e331582

Please sign in to comment.