Commit 153a4c142df90f769df68b333f533c639f923148
1 parent
5da7424f
Exists in
master
and in
4 other branches
updated gems: haml-rails, carrierwave
Showing
2 changed files
with
9 additions
and
8 deletions
Show diff stats
Gemfile
| @@ -53,10 +53,10 @@ gem 'enumerize' | @@ -53,10 +53,10 @@ gem 'enumerize' | ||
| 53 | gem "kaminari", "~> 0.14.1" | 53 | gem "kaminari", "~> 0.14.1" |
| 54 | 54 | ||
| 55 | # HAML | 55 | # HAML |
| 56 | -gem "haml-rails", "~> 0.3.5" | 56 | +gem "haml-rails" |
| 57 | 57 | ||
| 58 | # Files attachments | 58 | # Files attachments |
| 59 | -gem "carrierwave", "~> 0.7.1" | 59 | +gem "carrierwave" |
| 60 | 60 | ||
| 61 | # Authorization | 61 | # Authorization |
| 62 | gem "six" | 62 | gem "six" |
Gemfile.lock
| @@ -99,7 +99,7 @@ GEM | @@ -99,7 +99,7 @@ GEM | ||
| 99 | rack-test (>= 0.5.4) | 99 | rack-test (>= 0.5.4) |
| 100 | selenium-webdriver (~> 2.0) | 100 | selenium-webdriver (~> 2.0) |
| 101 | xpath (~> 1.0.0) | 101 | xpath (~> 1.0.0) |
| 102 | - carrierwave (0.7.1) | 102 | + carrierwave (0.8.0) |
| 103 | activemodel (>= 3.2.0) | 103 | activemodel (>= 3.2.0) |
| 104 | activesupport (>= 3.2.0) | 104 | activesupport (>= 3.2.0) |
| 105 | celluloid (0.12.4) | 105 | celluloid (0.12.4) |
| @@ -207,11 +207,12 @@ GEM | @@ -207,11 +207,12 @@ GEM | ||
| 207 | guard-spinach (0.0.2) | 207 | guard-spinach (0.0.2) |
| 208 | guard (>= 1.1) | 208 | guard (>= 1.1) |
| 209 | spinach | 209 | spinach |
| 210 | - haml (3.1.7) | ||
| 211 | - haml-rails (0.3.5) | 210 | + haml (4.0.0) |
| 211 | + tilt | ||
| 212 | + haml-rails (0.4) | ||
| 212 | actionpack (>= 3.1, < 4.1) | 213 | actionpack (>= 3.1, < 4.1) |
| 213 | activesupport (>= 3.1, < 4.1) | 214 | activesupport (>= 3.1, < 4.1) |
| 214 | - haml (~> 3.1) | 215 | + haml (>= 3.1, < 4.1) |
| 215 | railties (>= 3.1, < 4.1) | 216 | railties (>= 3.1, < 4.1) |
| 216 | hashie (1.2.0) | 217 | hashie (1.2.0) |
| 217 | hike (1.2.1) | 218 | hike (1.2.1) |
| @@ -466,7 +467,7 @@ DEPENDENCIES | @@ -466,7 +467,7 @@ DEPENDENCIES | ||
| 466 | binding_of_caller | 467 | binding_of_caller |
| 467 | bootstrap-sass (= 2.2.1.1) | 468 | bootstrap-sass (= 2.2.1.1) |
| 468 | capybara (= 2.0.2) | 469 | capybara (= 2.0.2) |
| 469 | - carrierwave (~> 0.7.1) | 470 | + carrierwave |
| 470 | chosen-rails (= 0.9.8) | 471 | chosen-rails (= 0.9.8) |
| 471 | coffee-rails (~> 3.2.2) | 472 | coffee-rails (~> 3.2.2) |
| 472 | colored | 473 | colored |
| @@ -495,7 +496,7 @@ DEPENDENCIES | @@ -495,7 +496,7 @@ DEPENDENCIES | ||
| 495 | growl | 496 | growl |
| 496 | guard-rspec | 497 | guard-rspec |
| 497 | guard-spinach | 498 | guard-spinach |
| 498 | - haml-rails (~> 0.3.5) | 499 | + haml-rails |
| 499 | httparty | 500 | httparty |
| 500 | jquery-atwho-rails (= 0.1.7) | 501 | jquery-atwho-rails (= 0.1.7) |
| 501 | jquery-rails (= 2.1.3) | 502 | jquery-rails (= 2.1.3) |