From 415713b6d30c56e265ae93ed8a9e51974126292b Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 14 Aug 2016 09:51:49 +0200 Subject: [PATCH] Bump bootstrap-rails --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 5f1433adc..897f43d01 100644 --- a/Gemfile +++ b/Gemfile @@ -54,7 +54,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors" # CSS -gem "bootstrap-sass", "3.3.6" +gem "bootstrap-sass", "3.3.7" gem "compass-rails", "2.0.5" gem "sass-rails", "5.0.4" gem "autoprefixer-rails", "6.4.0.2" diff --git a/Gemfile.lock b/Gemfile.lock index 97b70e92a..605a9817f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,7 +65,7 @@ GEM railties bcrypt (3.1.11) bindata (2.3.0) - bootstrap-sass (3.3.6) + bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap-switch-rails (3.3.3) @@ -646,8 +646,8 @@ GEM sprockets-rails rails-assets-autosize (3.0.15) rails-assets-blueimp-gallery (2.21.2) - rails-assets-bootstrap (3.3.6) - rails-assets-jquery (>= 1.9.1, < 3) + rails-assets-bootstrap (3.3.7) + rails-assets-jquery (>= 1.9.1, < 4) rails-assets-bootstrap-markdown (2.9.0) rails-assets-bootstrap (~> 3) rails-assets-diaspora_jsxc (0.1.5.develop.1) @@ -920,7 +920,7 @@ DEPENDENCIES asset_sync (= 1.1.0) autoprefixer-rails (= 6.4.0.2) backbone-on-rails (= 1.2.0.0) - bootstrap-sass (= 3.3.6) + bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) capybara (= 2.7.1) carrierwave (= 0.11.2)