From d3e339865e66d1ccf2097d50e5586b0d20bf5bfe Mon Sep 17 00:00:00 2001 From: Eben English Date: Fri, 31 Jul 2015 16:30:42 -0400 Subject: [PATCH] remove bootstrap-sass gem version locks in Gemfile; align bootstrap-sass in .gemspec with blacklight --- Gemfile | 6 ------ blacklight-maps.gemspec | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 5e23bdc..e79c759 100644 --- a/Gemfile +++ b/Gemfile @@ -8,12 +8,6 @@ gemspec # it'll want sprockets 2.11.0 and we'll have a conflict gem 'sprockets', '2.11.0' -# If we don't specify 3.2.15 we'll end up with sass 3.3.2 in the main -# Gemfile.lock but since sass-rails gets generated (rails new) into the test app -# it'll want sass 3.2.0 and we'll have a conflict -gem 'sass', '~> 3.2.0' -gem 'bootstrap-sass', ">= 3.1.1.1" - group :test do gem 'simplecov', require: false gem 'coveralls', require: false diff --git a/blacklight-maps.gemspec b/blacklight-maps.gemspec index 9f4cb04..a34d54d 100644 --- a/blacklight-maps.gemspec +++ b/blacklight-maps.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |spec| spec.add_dependency "rails" spec.add_dependency "blacklight", ">= 5.12.0" - spec.add_dependency "bootstrap-sass", "~> 3.3.4.1" + spec.add_dependency "bootstrap-sass", "~> 3.2" spec.add_dependency "leaflet-rails" spec.add_dependency "leaflet-markercluster-rails"