From 0e2d0aa0a60deb11606bbccb492f73a1ee2f514c Mon Sep 17 00:00:00 2001 From: Nicolae Claudius Date: Sun, 8 Dec 2013 17:29:53 +0200 Subject: [PATCH] compass version issue --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 063f3ad..7dfc4a2 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'acts_as_nested_interval', '~> 0.1.0' gem 'seedbank', '~> 0.3.0' gem 'unicorn', '~> 4.6.3' gem 'sass-rails', '~> 4.0.0' -gem 'compass-rails', '~> 2.0.alpha.0' +gem 'compass-rails', '~> 1.1.0' gem 'bootstrap-sass', '~> 3.0.2.1' gem 'webshims-rails', '~> 1.11.1' gem 'detect_timezone_rails', '~> 0.0.3' diff --git a/Gemfile.lock b/Gemfile.lock index f54fd5b..97b1f1b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,8 +95,8 @@ GEM chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) - compass-rails (2.0.alpha.0) - compass (>= 0.12.2, < 0.14) + compass-rails (1.1.2) + compass (>= 0.12.2) concerned_with (0.1.0) dalli (2.6.4) database_rewinder (0.0.2) @@ -290,7 +290,7 @@ DEPENDENCIES cancan (= 1.6.7) capybara (~> 2.1.0) coffee-rails (~> 4.0.0) - compass-rails (~> 2.0.alpha.0) + compass-rails (~> 1.1.0) concerned_with (~> 0.1.0) dalli (~> 2.6.2) database_rewinder (~> 0.0.1)