update html2haml, locked in nokogiri

This commit is contained in:
Georg Kahest 2017-04-05 10:06:47 +03:00
parent d899b340d1
commit 50b9150ed8
2 changed files with 7 additions and 7 deletions

View file

@ -31,7 +31,7 @@ gem 'rails-settings-cached', '0.4.1' # for settings
# html-xml
gem 'haml-rails', '0.9.0' # haml for views
gem 'nokogiri' # For XML parsing
gem 'nokogiri', '1.7.1' # For XML parsing
# style
gem 'sass-rails', '5.0.3' # sass style
@ -140,7 +140,7 @@ group :development, :test do
gem 'brakeman', '3.0.5', require: false # for security audit'
# tmp, otherwise conflics with breakman
# gem 'html2haml', github: 'haml/html2haml', ref: '6984f50bdbbd6291535027726a5697f28778ee8d'
gem 'html2haml', '2.0.0'
gem 'html2haml', '2.1.0'
gem 'sdoc', '0.4.1' # bundle exec rake doc:rails generates the API under doc/api.
gem 'railroady', '1.3.0' # to generate database diagrams

View file

@ -263,10 +263,10 @@ GEM
hashie (>= 3.0)
highline (1.6.21)
hpricot (0.8.6)
html2haml (2.0.0)
html2haml (2.1.0)
erubis (~> 2.7.0)
haml (~> 4.0.0)
nokogiri (~> 1.7.0)
haml (~> 4.0)
nokogiri (>= 1.6.0)
ruby_parser (~> 3.5)
html5_validators (1.2.2)
http-cookie (1.0.3)
@ -612,7 +612,7 @@ DEPENDENCIES
guard-rubocop (= 1.2.0)
haml-rails (= 0.9.0)
hashie-forbidden_attributes (= 0.1.1)
html2haml (= 2.0.0)
html2haml (= 2.1.0)
html5_validators (= 1.2.2)
isikukood
iso8601 (= 0.8.6)
@ -625,7 +625,7 @@ DEPENDENCIES
liquid (= 3.0.6)
mina (= 0.3.1)
money-rails (= 1.4.1)
nokogiri
nokogiri (= 1.7.1)
nprogress-rails (= 0.1.6.7)
paper_trail!
pdfkit (= 0.6.2)