diff --git a/Gemfile b/Gemfile index 9966e2fa2..438b6dcb5 100644 --- a/Gemfile +++ b/Gemfile @@ -120,7 +120,7 @@ group :assets do # CSS gem 'bootstrap-sass', '2.2.2.0' - gem 'compass-rails', '1.0.3' + gem 'compass-rails', '1.1.7' gem 'sass-rails', '3.2.6' # Compression diff --git a/Gemfile.lock b/Gemfile.lock index 6d50cbea7..b497a6bf4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,7 +70,7 @@ GEM timers (~> 1.1.0) childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) - chunky_png (1.2.9) + chunky_png (1.3.1) coderay (1.1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -79,12 +79,13 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) - compass (0.12.2) + compass (0.12.6) chunky_png (~> 1.2) fssm (>= 0.2.7) - sass (~> 3.1) - compass-rails (1.0.3) - compass (>= 0.12.2, < 0.14) + sass (~> 3.2.19) + compass-rails (1.1.7) + compass (>= 0.12.2) + sprockets (<= 2.11.0) configurate (0.0.8) connection_pool (1.2.0) crack (0.4.1) @@ -381,7 +382,7 @@ GEM ruby-progressbar (1.4.0) rubyzip (1.1.0) safe_yaml (0.9.7) - sass (3.2.13) + sass (3.2.19) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -468,7 +469,7 @@ DEPENDENCIES bootstrap-sass (= 2.2.2.0) capybara (= 2.2.1) carrierwave (= 0.10.0) - compass-rails (= 1.0.3) + compass-rails (= 1.1.7) configurate (= 0.0.8) cucumber-rails (= 1.4.0) database_cleaner (= 1.2.0)