diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2015-06-23 18:06:40 +0300 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2015-06-23 18:06:40 +0300 |
| commit | 791e18bf47b90eb4cbccdbbb6ae2e26124a1ef3b (patch) | |
| tree | 0b0eca332ff1236c3587b946c4f0d179fe24f2d3 | |
| parent | d64d48fd23c9624cc5c996e6516b7dc33fde5919 (diff) | |
| parent | bf9b497538b8c74e9cb29ba8a754184ebee499dd (diff) | |
Merge pull request #922 from fofr/update-sass-minimum-version
Change minimum sass version
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | bootstrap-sass.gemspec | 2 | ||||
| -rw-r--r-- | test/dummy_sass_only/Gemfile | 2 | ||||
| -rw-r--r-- | test/gemfiles/sass_3_2.gemfile | 6 |
4 files changed, 2 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 069e73cc..84db8f06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: ruby rvm: - 2.1.5 gemfile: - - test/gemfiles/sass_3_2.gemfile - test/gemfiles/sass_3_3.gemfile - test/gemfiles/sass_3_4.gemfile - test/gemfiles/sass_head.gemfile diff --git a/bootstrap-sass.gemspec b/bootstrap-sass.gemspec index 2ca8c886..d21cafd2 100644 --- a/bootstrap-sass.gemspec +++ b/bootstrap-sass.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |s| s.homepage = "https://github.com/twbs/bootstrap-sass" s.license = 'MIT' - s.add_runtime_dependency 'sass', '>= 3.2.19' + s.add_runtime_dependency 'sass', '>= 3.3.0' s.add_runtime_dependency 'autoprefixer-rails', '>= 5.0.0.1' # Testing dependencies diff --git a/test/dummy_sass_only/Gemfile b/test/dummy_sass_only/Gemfile index 75d2496a..bfde6fa1 100644 --- a/test/dummy_sass_only/Gemfile +++ b/test/dummy_sass_only/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' -gem 'sass', '~> 3.2' +gem 'sass', '~> 3.3' gem 'bootstrap-sass', path: '../..' diff --git a/test/gemfiles/sass_3_2.gemfile b/test/gemfiles/sass_3_2.gemfile deleted file mode 100644 index 6618ad74..00000000 --- a/test/gemfiles/sass_3_2.gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source "https://rubygems.org" - -gem 'sass', '~> 3.2.0' -gem 'compass', require: false - -gemspec path: '../../' |