summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-04-22 17:44:59 +0200
committerJames Lopez <james@jameslopez.es>2016-04-22 17:44:59 +0200
commitacf297955a5546161ac5e52589ba4740f234a0ae (patch)
treee52ac7029d34478af08b7d6627dc348f1f2e60cd /Gemfile
parentb18bd9c85f0d925aaa6ecf531673958bd97082fc (diff)
downloadgitlab-ce-acf297955a5546161ac5e52589ba4740f234a0ae.tar.gz
gitlab import UI - icon, file selector, etc... Also updated font-awesome and modified import source settings.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 67cc3f34b8c..f8bd26f36f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -213,7 +213,7 @@ gem 'jquery-turbolinks', '~> 2.1.0'
gem 'addressable', '~> 2.3.8'
gem 'bootstrap-sass', '~> 3.3.0'
-gem 'font-awesome-rails', '~> 4.2'
+gem 'font-awesome-rails', '~> 4.6.1'
gem 'gitlab_emoji', '~> 0.3.0'
gem 'gon', '~> 6.0.1'
gem 'jquery-atwho-rails', '~> 1.3.2'