diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-10-07 21:59:16 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-10-07 21:59:16 -0400 |
| commit | 53f43910addad75e14a0860235a4ade96bfc5009 (patch) | |
| tree | 2ee1a29b6eafea9f0b8c33d88eb94df9c6f8f1f8 | |
| parent | c670f0736648a4dbd558d2f41eea33f773dee3a6 (diff) | |
| download | gitlab-ce-rs-update-haml-rails.tar.gz | |
Update haml-rails to ~> 0.9.0rs-update-haml-rails
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 12 |
2 files changed, 10 insertions, 4 deletions
@@ -80,7 +80,7 @@ gem 'enumerize', '~> 0.7.0' gem "kaminari", "~> 0.16.3" # HAML -gem "haml-rails", '~> 0.5.3' +gem "haml-rails", '~> 0.9.0' # Files attachments gem "carrierwave", '~> 0.9.0' diff --git a/Gemfile.lock b/Gemfile.lock index fc9244304a3..56466ad95c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -330,10 +330,11 @@ GEM rspec (>= 2.14, < 4.0) haml (4.0.7) tilt - haml-rails (0.5.3) + haml-rails (0.9.0) actionpack (>= 4.0.1) activesupport (>= 4.0.1) - haml (>= 3.1, < 5.0) + haml (>= 4.0.6, < 5.0) + html2haml (>= 1.0.1) railties (>= 4.0.1) hashie (2.1.2) highline (1.6.21) @@ -345,6 +346,11 @@ GEM html-pipeline (1.11.0) activesupport (>= 2) nokogiri (~> 1.4) + html2haml (2.0.0) + erubis (~> 2.7.0) + haml (~> 4.0.0) + nokogiri (~> 1.6.0) + ruby_parser (~> 3.5) http-cookie (1.0.2) domain_name (~> 0.5) http_parser.rb (0.5.3) @@ -845,7 +851,7 @@ DEPENDENCIES grape-entity (~> 0.4.2) growl guard-rspec (~> 4.2.0) - haml-rails (~> 0.5.3) + haml-rails (~> 0.9.0) hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) httparty (~> 0.13.3) |