summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-02 06:06:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-02 06:06:09 +0000
commit01de60f3a8f4d99e641d04d31369628425137c21 (patch)
tree0d00bf0bd3c93c8ddc49a595ff97ef18b594a259 /Gemfile
parent558702b0b569b723474e3652bf46c3b84f322618 (diff)
downloadgitlab-ce-01de60f3a8f4d99e641d04d31369628425137c21.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 24e7a53126e..19b80dd3bd8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,6 @@ gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.1'
gem 'faraday', '~> 0.12'
-gem 'marginalia', '~> 1.8.0'
# Authentication libraries
gem 'devise', '~> 4.6'