summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-20 20:01:25 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-20 20:01:25 +0200
commit236584c2f804286b8cffab69c40deb0bca8c8632 (patch)
treec9878982763e80d4062f52123d7af70890f3762b /Gemfile.lock
parentebcbe0c87b12d10c40c6a3fa13ceec02e8220090 (diff)
downloadgitlab-ce-236584c2f804286b8cffab69c40deb0bca8c8632.tar.gz
update bootstrap to 2.2.1.1
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock5
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 693b2060eb1..d5be48d1c7d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,7 +97,8 @@ GEM
backports (2.6.5)
bcrypt-ruby (3.0.1)
blankslate (3.1.2)
- bootstrap-sass (2.0.4.0)
+ bootstrap-sass (2.2.1.1)
+ sass (~> 3.2)
builder (3.0.4)
capybara (1.1.3)
mime-types (>= 1.16)
@@ -446,7 +447,7 @@ DEPENDENCIES
acts-as-taggable-on (= 2.3.3)
annotate!
awesome_print
- bootstrap-sass (= 2.0.4)
+ bootstrap-sass (= 2.2.1.1)
capybara
carrierwave (~> 0.7.1)
chosen-rails (= 0.9.8)