From a36e46a769d6d1ab3c40fc4852c8353cc771637b Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Fri, 6 Feb 2015 18:52:01 +0500 Subject: [PATCH] [#369] update bootstrap-sass --- Gemfile | 2 +- Gemfile.lock | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 1094599c8..fdd843356 100644 --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,7 @@ gem 'time_diff' gem 'sass-rails', '~> 4.0' gem 'coffee-rails', '~> 4.1' -gem 'bootstrap-sass', '~> 3.2' +gem 'bootstrap-sass', '~> 3.3' gem 'font-awesome-rails', '~> 4.2' gem 'zeroclipboard-rails', '~> 0.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 60716391c..3699e08ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,6 +94,9 @@ GEM arel (4.0.2) attr_encrypted (1.3.3) encryptor (>= 1.3.0) + autoprefixer-rails (5.1.3.1) + execjs + json bcrypt (3.1.7) better_errors (2.0.0) coderay (>= 1.0.0) @@ -101,8 +104,9 @@ GEM rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.2.0.2) - sass (~> 3.2) + bootstrap-sass (3.3.3) + autoprefixer-rails (>= 5.0.0.1) + sass (>= 3.2.19) bourbon (3.2.3) sass (~> 3.2) thor @@ -539,7 +543,7 @@ DEPENDENCIES attr_encrypted (~> 1.3) better_errors binding_of_caller - bootstrap-sass (~> 3.2) + bootstrap-sass (~> 3.3) cancan! cape capistrano