diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-03 09:06:32 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-03 09:06:32 +0000 |
| commit | a5cfacc281855e3d2f1da4b08d4579a089c3d311 (patch) | |
| tree | bebfabbe6dc864550ac774744a5c568b0c259d76 /Gemfile.lock | |
| parent | 2d33579cbbf134b817329ab2589882e3587870aa (diff) | |
| parent | a99bf447a24957cf11b89d4f04a2b84613367ef2 (diff) | |
| download | gitlab-ce-a5cfacc281855e3d2f1da4b08d4579a089c3d311.tar.gz | |
Merge branch 'remove-rugged' into 'master'
Remove Gitlab::Git::Repository#rugged
See merge request gitlab-org/gitlab-ce!22039
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 69a1c899cc5..30c666932d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -295,9 +295,6 @@ GEM rouge (~> 3.1) sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.1) - mime-types (>= 1.15) - rugged (~> 0.25) gitlab-grit (2.8.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) @@ -1030,9 +1027,9 @@ DEPENDENCIES gettext_i18n_rails_js (~> 1.3) gitaly-proto (~> 0.118.1) github-linguist (~> 5.3.3) + github-markup (~> 1.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) - gitlab-gollum-rugged_adapter (~> 0.4.4) gitlab-markup (~> 1.6.4) gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) |