summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-03-27 20:41:35 +0000
committerRobert Speicher <robert@gitlab.com>2016-03-27 20:41:35 +0000
commita6a7a5ddd788cd6d549364176d26e1e15689d048 (patch)
treebd0ebd136df60f43106b3abbcbdca3bdbb1161d6 /Gemfile.lock
parentdb0da43a46f5fe5afd204795fba7253c928faf5a (diff)
parent057244b4c00526ea78d3b83afb04080a18c7e22f (diff)
downloadgitlab-ce-a6a7a5ddd788cd6d549364176d26e1e15689d048.tar.gz
Merge branch 'upgrade-font-awesome' into 'master'
Upgrade font-awesome-rails to 4.5.0.1 Includes Rails 5 support. [See Changelog for details](https://github.com/bokmann/font-awesome-rails/releases/tag/v4.5.0.1). Working towards #14286. See merge request !3399
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f79c66f4c58..a7980c32dde 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -325,8 +325,8 @@ GEM
fog-xml (0.1.2)
fog-core
nokogiri (~> 1.5, >= 1.5.11)
- font-awesome-rails (4.5.0.0)
- railties (>= 3.2, < 5.0)
+ font-awesome-rails (4.5.0.1)
+ railties (>= 3.2, < 5.1)
foreman (0.78.0)
thor (~> 0.19.1)
formatador (0.2.5)