From e813dc12ef370dea6e85404b7389793323ce6bbf Mon Sep 17 00:00:00 2001 From: Alex Coles Date: Mon, 25 Aug 2014 00:24:47 +0200 Subject: [PATCH 1/2] Remove compass, compass-rails dependencies Since 62885244 we rely on only one CSS mixin library: Bourbon. User Story # 11315 Signed-off-by: Alex Coles --- Gemfile | 2 -- Gemfile.lock | 9 --------- 2 files changed, 11 deletions(-) diff --git a/Gemfile b/Gemfile index ca794e316d..49798d8ef0 100644 --- a/Gemfile +++ b/Gemfile @@ -113,8 +113,6 @@ gem 'sass-rails', git: 'https://github.com/guilleiguaran/sass-rails.git', gem 'sass', '~> 3.3.6' gem 'bourbon', '~> 4.0' gem 'uglifier', '>= 1.0.3', require: false -gem 'compass', '1.0.0.alpha.19', require: 'compass/core' -gem 'compass-rails', git: 'https://github.com/Compass/compass-rails' gem 'livingstyleguide' diff --git a/Gemfile.lock b/Gemfile.lock index e2050cd6f0..ef92423621 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,3 @@ -GIT - remote: https://github.com/Compass/compass-rails - revision: f97a4f41518204683aeec7037da3d9b8c57ef4cb - specs: - compass-rails (2.0.0.pre) - compass (>= 0.12.2) - GIT remote: https://github.com/finnlabs/rack-protection.git revision: 5a7d1bd2f05ca75faf7909c8cc978732a0080898 @@ -455,8 +448,6 @@ DEPENDENCIES codeclimate-test-reporter coderay (~> 1.0.5) color-tools (~> 1.3.0) - compass (= 1.0.0.alpha.19) - compass-rails! cucumber-rails cucumber-rails-training-wheels daemons From 185ed5f21df9e55288aaf7cdd9c1799f61568603 Mon Sep 17 00:00:00 2001 From: Alex Coles Date: Mon, 25 Aug 2014 00:29:45 +0200 Subject: [PATCH 2/2] Bump livingstyleguide to 1.2.0.pre.1 This release series no longer depends on Compass. Signed-off-by: Alex Coles --- Gemfile | 2 +- Gemfile.lock | 27 ++------------------------- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/Gemfile b/Gemfile index 49798d8ef0..e52b3d776b 100644 --- a/Gemfile +++ b/Gemfile @@ -113,7 +113,7 @@ gem 'sass-rails', git: 'https://github.com/guilleiguaran/sass-rails.git', gem 'sass', '~> 3.3.6' gem 'bourbon', '~> 4.0' gem 'uglifier', '>= 1.0.3', require: false -gem 'livingstyleguide' +gem 'livingstyleguide', '~> 1.2.0.pre.1' # You don't need therubyracer if you have nodejs installed on the machine precompiling assets. diff --git a/Gemfile.lock b/Gemfile.lock index ef92423621..78f1ce28b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -118,7 +118,6 @@ GEM capybara (>= 1.0, < 3) childprocess (0.5.3) ffi (~> 1.0, >= 1.0.11) - chunky_png (1.3.1) climate_control (0.0.3) activesupport (>= 3.0) cocaine (0.5.4) @@ -130,18 +129,6 @@ GEM descendants_tracker (~> 0.0.1) color-tools (1.3.0) columnize (0.8.9) - compass (1.0.0.alpha.19) - chunky_png (~> 1.2) - compass-core (~> 1.0.0.alpha.19) - compass-import-once (~> 1.0.3) - json - listen (~> 1.1.0) - sass (>= 3.3.0, < 3.5) - compass-core (1.0.0.alpha.19) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) - compass-import-once (1.0.4) - sass (>= 3.2, < 3.5) cucumber (1.3.8) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -223,12 +210,7 @@ GEM letter_opener (1.0.0) launchy (>= 2.0.4) libv8 (3.11.8.17) - listen (1.1.6) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - rb-kqueue (>= 0.2) - livingstyleguide (1.0.4) - compass + livingstyleguide (1.2.0.pre.1) hooks (= 0.3.3) minisyntax redcarpet (~> 3.0.0) @@ -322,11 +304,6 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (10.3.2) - rb-fsevent (0.9.4) - rb-inotify (0.9.4) - ffi (>= 0.5.0) - rb-kqueue (0.2.2) - ffi (>= 0.5.0) rb-readline (0.5.1) rdoc (3.12.2) json (~> 1.4) @@ -468,7 +445,7 @@ DEPENDENCIES json_spec launchy (~> 2.3.0) letter_opener (~> 1.0.0) - livingstyleguide + livingstyleguide (~> 1.2.0.pre.1) multi_json mysql2 (~> 0.3.11) net-ldap (~> 0.2.2)