summaryrefslogtreecommitdiff
path: root/Gemfile
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
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')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 1a628a68310..3ce4ba4a2a5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -200,7 +200,7 @@ gem 'turbolinks', '~> 2.5.0'
gem 'jquery-turbolinks', '~> 2.1.0'
gem 'addressable', '~> 2.3.8'
-gem 'bootstrap-sass', '~> 3.0'
+gem 'bootstrap-sass', '~> 3.3.0'
gem 'font-awesome-rails', '~> 4.2'
gem 'gitlab_emoji', '~> 0.2.0'
gem 'gon', '~> 6.0.1'