summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-06-13 14:05:08 +0200
committerJames Lopez <james@jameslopez.es>2016-06-13 14:05:08 +0200
commitd6adfe0418c6c060c60264ae40299ec99986f6a7 (patch)
tree8479a88d27e8fe316b698975cdb882f76c67192d
parente83fc684a583140ce30644a7062f8470880fdf43 (diff)
downloadgitlab-ce-d6adfe0418c6c060c60264ae40299ec99986f6a7.tar.gz
fix gemfile
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index dfc15700494..fe6785249fb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -253,7 +253,7 @@ GEM
fog-xml (0.1.2)
fog-core
nokogiri (~> 1.5, >= 1.5.11)
- font-awesome-rails (4.5.0.1)
+ font-awesome-rails (4.6.1.0)
railties (>= 3.2, < 5.1)
foreman (0.78.0)
thor (~> 0.19.1)
@@ -881,7 +881,7 @@ DEPENDENCIES
fog-google (~> 0.3)
fog-local (~> 0.3)
fog-openstack (~> 0.1)
- font-awesome-rails (~> 4.2)
+ font-awesome-rails (~> 4.6.1)
foreman
fuubar (~> 2.0.0)
gemnasium-gitlab-service (~> 0.2)