summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-04 10:19:31 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-04 10:19:31 +0000
commita2ba239fb4e8d6602f74bd1256176dcd9538629e (patch)
tree32c7ab0b40bab1b3eab331ab085656964465b154 /Gemfile.lock
parent55e12ccd8ac32078073f4efad102164535049319 (diff)
parent93ef00850001962955a2f9c8f34a530a9cf8972f (diff)
downloadgitlab-ce-a2ba239fb4e8d6602f74bd1256176dcd9538629e.tar.gz
Merge branch 'rs-bump-bootstrap-sass' into 'master'
Bump bootstrap-sass to ~> 3.3.0 Resolves bootlint error: `bootlint: W013 Bootstrap version might be outdated. Latest version is at least 3.3.6 ; saw what appears to be usage of Bootstrap 3.3.5` See merge request !2275
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock10
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 7b70c05bc48..ffb7cef0aba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -66,7 +66,7 @@ GEM
attr_encrypted (1.3.4)
encryptor (>= 1.3.0)
attr_required (1.0.0)
- autoprefixer-rails (6.1.2)
+ autoprefixer-rails (6.2.3)
execjs
json
awesome_print (1.2.0)
@@ -82,9 +82,9 @@ GEM
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
- bootstrap-sass (3.3.5)
- autoprefixer-rails (>= 5.0.0.1)
- sass (>= 3.2.19)
+ bootstrap-sass (3.3.6)
+ autoprefixer-rails (>= 5.2.1)
+ sass (>= 3.3.4)
brakeman (3.1.4)
erubis (~> 2.6)
fastercsv (~> 1.5)
@@ -843,7 +843,7 @@ DEPENDENCIES
benchmark-ips
better_errors (~> 1.0.1)
binding_of_caller (~> 0.7.2)
- bootstrap-sass (~> 3.0)
+ bootstrap-sass (~> 3.3.0)
brakeman (~> 3.1.0)
browser (~> 1.0.0)
bullet