'bundle update' and lock Bootstrap to 2.x

amomusik · Aug 28, 2013 · d1e6d0f · d1e6d0f
1 parent 332c1f2
commit d1e6d0f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/Gemfile b/Gemfile
@@ -30,7 +30,7 @@ group :assets do
   gem 'compass-rails'
   gem 'coffee-rails'
   gem 'uglifier'
-  gem 'bootstrap-sass-rails'
+  gem 'bootstrap-sass-rails', '~> 2.3.0'
   gem 'font-awesome-rails'
   gem 'jquery-ui-rails'
   gem 'backbone-on-rails'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -33,12 +33,12 @@ GEM
     addressable (2.3.5)
     arel (3.0.2)
     awesome_print (1.1.0)
-    backbone-on-rails (1.0.0.0)
+    backbone-on-rails (1.0.0.1)
       eco
       ejs
       jquery-rails
       rails (>= 3.1)
-    bcrypt-ruby (3.1.1)
+    bcrypt-ruby (3.1.2)
     bootstrap-sass-rails (2.3.2.1)
       railties (>= 3.1.0)
       sass-rails (>= 3.1.0)
@@ -73,7 +73,7 @@ GEM
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
     daemons (1.1.9)
-    devise (2.2.6)
+    devise (2.2.7)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
@@ -87,8 +87,7 @@ GEM
     ejs (1.1.1)
     erubis (2.7.0)
     eventmachine (1.0.3)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.0.1)
     factory_girl (4.2.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.2.1)
@@ -248,10 +247,10 @@ GEM
     select2-rails (3.4.8)
       sass-rails
       thor (~> 0.14)
-    selenium-webdriver (2.35.0)
+    selenium-webdriver (2.35.1)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (< 1.0.0)
       websocket (~> 1.0.4)
     sentry-raven (0.6.0)
       faraday (>= 0.7.6)
@@ -270,25 +269,25 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.8)
     terminal-notifier-guard (1.5.3)
     thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.18.1)
     tilt (1.4.1)
-    treetop (1.4.14)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbo-sprockets-rails3 (0.3.8)
+    turbo-sprockets-rails3 (0.3.9)
       railties (> 3.2.8, < 4.0.0)
       sprockets (>= 2.0.0)
     tzinfo (0.3.37)
-    uglifier (2.1.2)
+    uglifier (2.2.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    uniform_notifier (1.2.0)
+    uniform_notifier (1.3.0)
     uuidtools (2.1.4)
     warden (1.2.3)
       rack (>= 1.0)
@@ -306,7 +305,7 @@ DEPENDENCIES
   active_hash
   awesome_print
   backbone-on-rails
-  bootstrap-sass-rails
+  bootstrap-sass-rails (~> 2.3.0)
   bullet
   capybara (>= 2.0.1)
   capybara-screenshot