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
Showing
... | @@ -79,10 +79,6 @@ gem 'gpgme' | ... | @@ -79,10 +79,6 @@ gem 'gpgme' |
gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' | gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' | ||
gem 'net-ldap' | gem 'net-ldap' | ||
# Git Wiki | |||
# Only used to compute wiki page slugs | |||
gem 'gitlab-gollum-lib', '~> 4.2', require: false | |||
# API | # API | ||
gem 'grape', '~> 1.1' | gem 'grape', '~> 1.1' | ||
gem 'grape-entity', '~> 0.7.1' | gem 'grape-entity', '~> 0.7.1' | ||
... | @@ -210,7 +206,7 @@ gem 'hipchat', '~> 1.5.0' | ... | @@ -210,7 +206,7 @@ gem 'hipchat', '~> 1.5.0' |
gem 'jira-ruby', '~> 1.4' | gem 'jira-ruby', '~> 1.4' | ||
# Flowdock integration | # Flowdock integration | ||
gem 'gitlab-flowdock-git-hook', '~> 1.0.1' | gem 'flowdock', '~> 0.7' | ||
# Slack integration | # Slack integration | ||
gem 'slack-notifier', '~> 1.5.1' | gem 'slack-notifier', '~> 1.5.1' | ||
... | ... |
lib/flowdock/git.rb
0 → 100644
lib/flowdock/git/builder.rb
0 → 100644
想要评论请 注册 或 登录