summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-29 03:06:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-29 03:06:28 +0000
commita5eef71805f791dac4ce14a30ca6b59ee31295c8 (patch)
treeb799eafca34c5e82a191a419ab0aba1f4ab4d043 /Gemfile.lock
parentabfafe3c57f56cd76a0a9afb7275cddb12304544 (diff)
downloadgitlab-ce-a5eef71805f791dac4ce14a30ca6b59ee31295c8.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock3
1 files changed, 0 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index d3e98209694..ab94c876a9d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -334,8 +334,6 @@ GEM
nokogiri (>= 1.5.11, < 2.0.0)
font-awesome-rails (4.7.0.4)
railties (>= 3.2, < 6.0)
- foreman (0.84.0)
- thor (~> 0.19.1)
formatador (0.2.5)
fugit (1.2.1)
et-orbi (~> 1.1, >= 1.1.8)
@@ -1161,7 +1159,6 @@ DEPENDENCIES
fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1)
font-awesome-rails (~> 4.7)
- foreman (~> 0.84.0)
fugit (~> 1.2.1)
fuubar (~> 2.2.0)
gemojione (~> 3.3)