summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-10-17 13:17:20 +0000
committerRémy Coutable <remy@rymai.me>2018-10-17 13:17:20 +0000
commit1696a3e8c36a0336e62ec990fd8b4e0517e4c93c (patch)
tree7aa2ebfb39874599ab25cf87f8a26b37f5a62e7a /Gemfile
parent071b39a22c8a3efc4e3a0531c71e1e8161b78f47 (diff)
parentc5bff77ea4a6170a3dc1966254feac0ca1836eaa (diff)
downloadgitlab-ce-1696a3e8c36a0336e62ec990fd8b4e0517e4c93c.tar.gz
Merge branch '44361-remove-gitlab-grit' into 'master'
Remove gitlab-grit as a transitive dependency of GitLab Closes #44361 See merge request gitlab-org/gitlab-ce!22373
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile6
1 files changed, 1 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 4b92bdb87fe..64d87baf697 100644
--- a/Gemfile
+++ b/Gemfile
@@ -79,10 +79,6 @@ gem 'gpgme'
gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
gem 'net-ldap'
-# Git Wiki
-# Only used to compute wiki page slugs
-gem 'gitlab-gollum-lib', '~> 4.2', require: false
-
# API
gem 'grape', '~> 1.1'
gem 'grape-entity', '~> 0.7.1'
@@ -210,7 +206,7 @@ gem 'hipchat', '~> 1.5.0'
gem 'jira-ruby', '~> 1.4'
# Flowdock integration
-gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
+gem 'flowdock', '~> 0.7'
# Slack integration
gem 'slack-notifier', '~> 1.5.1'