Skip to content

Commit

Permalink
Merge pull request #1315 from internetee/replace-haml-rails-gem-with-…
Browse files Browse the repository at this point in the history
…haml

Replace `haml-rails` gem with `haml`
  • Loading branch information
vohmar authored Sep 16, 2019
2 parents 03c81c4 + 44f123f commit 7d61a92
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ gem 'paper_trail', '~> 4.0'
# 0.7.3 is the latest for Rails 4.2, however, it is absent on Rubygems server
# https://github.com/huacnlee/rails-settings-cached/issues/165
gem 'rails-settings-cached', '0.7.2'

# html-xml
gem 'haml-rails', '0.9.0' # haml for views
gem 'nokogiri'

# style
Expand Down Expand Up @@ -91,6 +88,7 @@ gem 'company_register', github: 'internetee/company_register', branch: :master
gem 'e_invoice', github: 'internetee/e_invoice', branch: :master
gem 'lhv', github: 'internetee/lhv', tag: 'v0.1.0'
gem 'domain_name'
gem 'haml'

group :development do
# deploy
Expand Down
8 changes: 1 addition & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,6 @@ GEM
builder (>= 2.1.2)
haml (4.0.7)
tilt
haml-rails (0.9.0)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 4.0.6, < 5.0)
html2haml (>= 1.0.1)
railties (>= 4.0.1)
hashdiff (1.0.0)
hpricot (0.8.6)
html2haml (2.1.0)
Expand Down Expand Up @@ -481,7 +475,7 @@ DEPENDENCIES
factory_bot_rails
figaro (= 1.1.1)
grape
haml-rails (= 0.9.0)
haml
html2haml (= 2.1.0)
isikukood
iso8601 (= 0.8.6)
Expand Down

0 comments on commit 7d61a92

Please sign in to comment.