diff --git a/.travis.yml b/.travis.yml index f5bd17b..4b2d1a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,6 @@ gemfile: - gemfiles/Gemfile-sass-3-2 - gemfiles/Gemfile-sass-3-3 - gemfiles/Gemfile-sass-3-4 - - gemfiles/Gemfile-sass-3-5 sudo: false @@ -35,7 +34,7 @@ matrix: allow_failures: - rvm: rbx-2 exclude: - - gemfile: gemfiles/Gemfile-sass-3-5 + - gemfile: gemfiles/Gemfile-sass-3-4 rvm: 1.9.3 - gemfile: gemfiles/Gemfile-rails-5-0 rvm: 1.9.3 diff --git a/gemfiles/Gemfile-rails-4-0 b/gemfiles/Gemfile-rails-4-0 index d3af4eb..656e84c 100644 --- a/gemfiles/Gemfile-rails-4-0 +++ b/gemfiles/Gemfile-rails-4-0 @@ -4,5 +4,5 @@ source "https://rubygems.org" gemspec path: ".." gem "rails", "~> 4.0.0" -gem "sass", "~> 3.4.0" +gem "sass", "~> 3.3.0" gem "mime-types", "< 2" diff --git a/gemfiles/Gemfile-rails-4-1 b/gemfiles/Gemfile-rails-4-1 index c6f5688..80938ef 100644 --- a/gemfiles/Gemfile-rails-4-1 +++ b/gemfiles/Gemfile-rails-4-1 @@ -4,5 +4,5 @@ source "https://rubygems.org" gemspec path: ".." gem "rails", "~> 4.1.0" -gem "sass", "~> 3.4.0" +gem "sass", "~> 3.3.0" gem "mime-types", "< 2" diff --git a/gemfiles/Gemfile-rails-4-2 b/gemfiles/Gemfile-rails-4-2 index acb2f97..b48c5e0 100644 --- a/gemfiles/Gemfile-rails-4-2 +++ b/gemfiles/Gemfile-rails-4-2 @@ -4,5 +4,5 @@ source "https://rubygems.org" gemspec path: ".." gem "rails", "~> 4.2.0" -gem "sass", "~> 3.4.0" +gem "sass", "~> 3.3.0" gem "mime-types", "< 2" diff --git a/gemfiles/Gemfile-rails-5-0 b/gemfiles/Gemfile-rails-5-0 index 03f50eb..6e725fb 100644 --- a/gemfiles/Gemfile-rails-5-0 +++ b/gemfiles/Gemfile-rails-5-0 @@ -4,4 +4,3 @@ source "https://rubygems.org" gemspec path: ".." gem "rails", github: 'rails/rails', branch: '5-0-stable' -gem "sass", "~> 3.4.0" diff --git a/gemfiles/Gemfile-sass-3-5 b/gemfiles/Gemfile-sass-3-5 deleted file mode 100644 index 319ff04..0000000 --- a/gemfiles/Gemfile-sass-3-5 +++ /dev/null @@ -1,8 +0,0 @@ -source "https://rubygems.org" - -# Specify your gem"s dependencies in sass-rails.gemspec -gemspec path: ".." - -gem "rails" -gem "sass", "~> 3.5.0" -gem "mime-types", "< 2" diff --git a/gemfiles/Gemfile-sprockets-2-11 b/gemfiles/Gemfile-sprockets-2-11 index fdb270a..2af3c69 100644 --- a/gemfiles/Gemfile-sprockets-2-11 +++ b/gemfiles/Gemfile-sprockets-2-11 @@ -5,4 +5,5 @@ gemspec path: ".." gem "rails" gem "sprockets", "~> 2.11.0" +gem "sass", "~> 3.3.0" gem "mime-types", "< 2" diff --git a/gemfiles/Gemfile-sprockets-2-12 b/gemfiles/Gemfile-sprockets-2-12 index 74ad43d..2e2afe2 100644 --- a/gemfiles/Gemfile-sprockets-2-12 +++ b/gemfiles/Gemfile-sprockets-2-12 @@ -5,4 +5,5 @@ gemspec path: ".." gem "rails" gem "sprockets", "~> 2.12.0" +gem "sass", "~> 3.3.0" gem "mime-types", "< 2" diff --git a/gemfiles/Gemfile-sprockets-2-8 b/gemfiles/Gemfile-sprockets-2-8 index dce7962..3dbf594 100644 --- a/gemfiles/Gemfile-sprockets-2-8 +++ b/gemfiles/Gemfile-sprockets-2-8 @@ -5,4 +5,5 @@ gemspec path: ".." gem "rails" gem "sprockets", "~> 2.8.0" +gem "sass", "~> 3.3.0" gem "mime-types", "< 2" diff --git a/gemfiles/Gemfile-sprockets-3-0 b/gemfiles/Gemfile-sprockets-3-0 index 8a4c583..1954fbe 100644 --- a/gemfiles/Gemfile-sprockets-3-0 +++ b/gemfiles/Gemfile-sprockets-3-0 @@ -5,4 +5,5 @@ gemspec path: ".." gem "rails" gem "sprockets", "~> 3.0.0" +gem "sass", "~> 3.3.0" gem "mime-types", "< 2" diff --git a/gemfiles/Gemfile-sprockets-rails-2-2 b/gemfiles/Gemfile-sprockets-rails-2-2 index a2ccd49..7789866 100644 --- a/gemfiles/Gemfile-sprockets-rails-2-2 +++ b/gemfiles/Gemfile-sprockets-rails-2-2 @@ -5,5 +5,5 @@ gemspec path: ".." gem "rails" gem "sprockets-rails", "~> 2.2.0" -gem "sass", "~> 3.4.0" +gem "sass", "~> 3.3.0" gem "mime-types", "< 2" diff --git a/gemfiles/Gemfile-sprockets-rails-master b/gemfiles/Gemfile-sprockets-rails-master index 8ec1670..c4e90af 100644 --- a/gemfiles/Gemfile-sprockets-rails-master +++ b/gemfiles/Gemfile-sprockets-rails-master @@ -5,5 +5,5 @@ gemspec path: ".." gem "rails" gem "sprockets-rails", github: "rails/sprockets-rails" -gem "sass", "~> 3.4.0" +gem "sass", "~> 3.3.0" gem "mime-types", "< 2"