diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-10-17 13:17:20 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-10-17 13:17:20 +0000 |
| commit | 1696a3e8c36a0336e62ec990fd8b4e0517e4c93c (patch) | |
| tree | 7aa2ebfb39874599ab25cf87f8a26b37f5a62e7a /Gemfile.lock | |
| parent | 071b39a22c8a3efc4e3a0531c71e1e8161b78f47 (diff) | |
| parent | c5bff77ea4a6170a3dc1966254feac0ca1836eaa (diff) | |
| download | gitlab-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.lock')
| -rw-r--r-- | Gemfile.lock | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8317f980eec..a39788bee9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -278,23 +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) - gollum-grit_adapter (~> 1.0) - nokogiri (>= 1.6.1, < 2.0) - rouge (~> 3.1) - sanitize (~> 4.6.4) - stringex (~> 2.6) - gitlab-grit (2.8.2) - charlock_holmes (~> 0.6) - diff-lcs (~> 1.1) - mime-types (>= 1.16) - posix-spawn (~> 0.3) gitlab-markup (1.6.4) gitlab-sidekiq-fetcher (0.3.0) sidekiq (~> 5) @@ -309,8 +292,6 @@ GEM rubyntlm (~> 0.5) globalid (0.4.1) activesupport (>= 4.2.0) - gollum-grit_adapter (1.0.1) - gitlab-grit (~> 2.7, >= 2.7.1) gon (6.2.0) actionpack (>= 3.0) multi_json @@ -594,7 +575,6 @@ GEM pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) - posix-spawn (0.3.13) powerpack (0.1.1) premailer (1.10.4) addressable @@ -865,7 +845,6 @@ GEM state_machines-activerecord (0.5.1) activerecord (>= 4.1, < 6.0) state_machines-activemodel (>= 0.5.0) - stringex (2.8.4) sys-filesystem (1.1.6) ffi sysexits (1.2.0) @@ -1003,6 +982,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) @@ -1019,8 +999,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 gitlab-styles (~> 2.4) |