diff options
author | Nick Thomas <nick@gitlab.com> | 2018-10-15 17:03:14 +0100 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-10-16 11:54:55 +0100 |
commit | 04aaf71932646efd99f2abd74fc59e3129fcbe1d (patch) | |
tree | a6de51762eff3787ed262f7192b0408e80ee8b44 /Gemfile.lock | |
parent | e347170cc59dfa1e48de451f7c48ccb65d3e581a (diff) | |
download | gitlab-ce-04aaf71932646efd99f2abd74fc59e3129fcbe1d.tar.gz |
Inline the gitlab-flowdock-git-hooks gem
This allows us to avoid one transitive dependency on gitlab-grit. The
aim is to remove all transitive dependencies.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bd95f417caa..e0c098c3d8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -278,10 +278,6 @@ GEM google-protobuf (~> 3.1) grpc (~> 1.10) github-markup (1.7.0) - gitlab-flowdock-git-hook (1.0.1) - flowdock (~> 0.7) - gitlab-grit (>= 2.4.1) - multi_json gitlab-gollum-lib (4.2.7.5) gemojione (~> 3.2) github-markup (~> 1.6) @@ -1009,6 +1005,7 @@ DEPENDENCIES flipper (~> 0.13.0) flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) + flowdock (~> 0.7) fog-aliyun (~> 0.2.0) fog-aws (~> 2.0.1) fog-core (~> 1.44) @@ -1025,7 +1022,6 @@ DEPENDENCIES gettext_i18n_rails_js (~> 1.3) gitaly-proto (~> 0.118.1) github-markup (~> 1.7.0) - gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) gitlab-markup (~> 1.6.4) gitlab-sidekiq-fetcher |