Skip to content

Commit

Permalink
Merge pull request #558 from internetee/update-nokogiri-gem
Browse files Browse the repository at this point in the history
Update nokogiri gem
  • Loading branch information
vohmar authored Jun 21, 2017
2 parents b5d48e3 + c507082 commit 2a78e12
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ gem 'rails-settings-cached', '0.4.1' # for settings

# html-xml
gem 'haml-rails', '0.9.0' # haml for views
gem 'nokogiri', '1.7.1' # For XML parsing
gem 'nokogiri', '~> 1.7'

# style
gem 'bootstrap-sass', '3.3.5.1' # bootstrap style
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ GEM
multi_json (1.12.1)
multi_xml (0.6.0)
netrc (0.11.0)
nokogiri (1.7.1)
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
nori (2.6.0)
nprogress-rails (0.1.6.7)
Expand Down Expand Up @@ -537,7 +537,7 @@ DEPENDENCIES
liquid (= 3.0.6)
mina (= 0.3.1)
money-rails
nokogiri (= 1.7.1)
nokogiri (~> 1.7)
nprogress-rails (= 0.1.6.7)
paper_trail!
pdfkit (= 0.6.2)
Expand Down

0 comments on commit 2a78e12

Please sign in to comment.