summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-03 13:42:24 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-03 13:42:24 +0300
commit0676f1da7e1787594ccb5d839619a40ff134596f (patch)
treee11678285d1097ac365045f2f483e475ef04132c /Gemfile
parentac6f0321227c3df4ed9a255eccaaafa2d9527d4b (diff)
parent5d8be4438add1183d91e030b852c628cf09f4916 (diff)
downloadgitlab-ce-0676f1da7e1787594ccb5d839619a40ff134596f.tar.gz
Merge pull request #7934 from Soullivaneuh/font-awesome
Upgrade to Font Awesome v4.2
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 4d831c1c232..72b19549896 100644
--- a/Gemfile
+++ b/Gemfile
@@ -180,7 +180,7 @@ gem "jquery-ui-rails"
gem "jquery-scrollto-rails"
gem "raphael-rails", "~> 2.1.2"
gem 'bootstrap-sass', '~> 3.0'
-gem "font-awesome-rails", '~> 3.2'
+gem "font-awesome-rails", '~> 4.2'
gem "gitlab_emoji", "~> 0.0.1.1"
gem "gon", '~> 5.0.0'
gem 'nprogress-rails'