diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -48,7 +48,7 @@ gem 'unidecoder' group :assets do gem 'bootstrap-sass' gem 'sass-rails', '~> 3.2.3' - gem 'compass-rails' + gem 'compass-rails', '2.0.0' gem 'coffee-rails', "~> 3.2.1" gem 'uglifier', '>= 1.0.3' gem 'therubyracer' diff --git a/Gemfile.lock b/Gemfile.lock index c6f9c96ee..51f736b50 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,7 @@ GEM net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.1.0) charlock_holmes (0.6.9.4) - chunky_png (1.2.8) + chunky_png (1.3.3) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -80,8 +80,8 @@ GEM chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) - compass-rails (1.0.3) - compass (>= 0.12.2, < 0.14) + compass-rails (2.0.0) + compass (>= 0.12.2) coveralls (0.6.7) colorize multi_json (~> 1.3) @@ -292,7 +292,7 @@ DEPENDENCIES capistrano charlock_holmes coffee-rails (~> 3.2.1) - compass-rails + compass-rails (= 2.0.0) coveralls debugger dynamic_form |