Skip to content

Commit

Permalink
update nokogiri
Browse files Browse the repository at this point in the history
  • Loading branch information
dreamfall committed May 15, 2017
1 parent 8aba335 commit 67350c4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ gem 'enumerize', '~> 0.8'
# PDF generation
gem 'prawn'
gem 'prawn-table'
gem 'nokogiri', '~> 1.6.0'
gem 'nokogiri', '~> 1.7'

# Uploads
gem 'carrierwave'
Expand Down
30 changes: 14 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ GEM
bootstrap-sass (3.3.3)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
builder (3.2.2)
builder (3.2.3)
byebug (9.0.4)
capybara (2.7.1)
addressable
Expand Down Expand Up @@ -261,15 +261,15 @@ GEM
hashery (2.1.1)
hashie (3.4.4)
httpclient (2.6.0.1)
i18n (0.7.0)
i18n (0.8.1)
ice_nine (0.11.1)
inflecto (0.0.2)
ipaddress (0.8.0)
jbuilder (2.2.5)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (4.0.4)
rails-dom-testing (~> 1.0)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.3)
Expand All @@ -295,7 +295,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.0)
minitest (5.10.2)
multi_json (1.12.1)
multipart-post (2.0.0)
net-scp (1.2.1)
Expand All @@ -305,9 +305,8 @@ GEM
nilify_blanks (1.2.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
nokogiri (1.6.8)
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
orm_adapter (0.5.0)
paper_trail (5.1.1)
activerecord (>= 3.0, < 6.0)
Expand All @@ -329,7 +328,6 @@ GEM
activerecord (>= 3.1)
activesupport (>= 3.1)
arel
pkg-config (1.1.7)
powerpack (0.1.0)
prawn (1.3.0)
pdf-core (~> 0.4.0)
Expand All @@ -352,7 +350,7 @@ GEM
pusher-signature (0.1.8)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.6)
rack (1.6.7)
rack-mini-profiler (0.10.2)
rack (>= 1.2.0)
rack-protection (1.5.3)
Expand All @@ -373,9 +371,9 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
Expand All @@ -392,7 +390,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
rake (11.2.2)
rake (12.0.0)
redis (3.2.2)
redis-actionpack (4.0.0)
actionpack (~> 4)
Expand Down Expand Up @@ -494,15 +492,15 @@ GEM
sprockets (>= 2.8, < 4.0)
statesman (1.1.0)
temple (0.7.5)
thor (0.19.1)
thread_safe (0.3.5)
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.5)
timecop (0.7.3)
ttfunk (1.4.0)
turnip (2.1.1)
gherkin (~> 2.5)
rspec (>= 3.0, < 4.0)
tzinfo (1.2.2)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
Expand Down Expand Up @@ -574,7 +572,7 @@ DEPENDENCIES
lograge
newrelic_rpm
nilify_blanks
nokogiri (~> 1.6.0)
nokogiri (~> 1.7)
paper_trail (~> 5.1.0)
pdf-inspector
pg (~> 0.17)
Expand Down

0 comments on commit 67350c4

Please sign in to comment.