Skip to content

Commit

Permalink
Merge pull request #332 from FranckKe/dependabot/bundler/nokogiri-1.11.0
Browse files Browse the repository at this point in the history
Bump nokogiri from 1.10.10 to 1.11.0
  • Loading branch information
FranckKe authored Mar 15, 2021
2 parents fb13cd0 + e9085b6 commit a7229fd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ gem 'state_machines-activerecord', '~> 0.5'
gem 'wysiwyg-rails', '~> 2'
# https://github.com/sferik/rails_admin/wiki/Froala-WYSIWYG-HTML-Editor
gem 'bugsnag', '~> 6.6'
gem 'nokogiri', '~> 1.10'
gem 'nokogiri', '~> 1.11'

group :development do
gem 'annotate'
Expand Down
10 changes: 6 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,13 @@ GEM
mimemagic (0.3.5)
mini_magick (4.10.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
mini_portile2 (2.5.0)
minitest (5.14.1)
nested_form (0.3.2)
nio4r (2.5.2)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogiri (1.11.0)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.19.2)
parser (2.7.1.4)
Expand All @@ -209,6 +210,7 @@ GEM
activesupport (>= 3.0.0)
pundit-matchers (1.6.0)
rspec-rails (>= 3.0.0)
racc (1.5.2)
rack (2.2.3)
rack-cors (1.1.1)
rack (>= 2.0.0)
Expand Down Expand Up @@ -397,7 +399,7 @@ DEPENDENCIES
json-schema (~> 2.8)
leaflet-rails (~> 1)
listen
nokogiri (~> 1.10)
nokogiri (~> 1.11)
pg (~> 1)
postmark (~> 1)
puma (~> 3)
Expand Down

0 comments on commit a7229fd

Please sign in to comment.