diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-01-04 13:43:06 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-01-04 19:09:28 -0500 |
| commit | a00578ce5cdf4bab95990bca9e806c6322bb1384 (patch) | |
| tree | 5aafe058fa55086038dbb3086121ad624447c0e4 /Gemfile.lock | |
| parent | aec04a47c16665f1dfb1fb61647c3f78a4dde20f (diff) | |
| download | gitlab-ce-a00578ce5cdf4bab95990bca9e806c6322bb1384.tar.gz | |
Absorb gitlab_git
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5dcf3744d99..c99313163a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -255,11 +255,6 @@ GEM mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) gitlab-markup (1.5.0) - gitlab_git (10.7.0) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) omniauth (~> 1.0) @@ -857,7 +852,6 @@ DEPENDENCIES github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.0) - gitlab_git (~> 10.7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) @@ -942,6 +936,7 @@ DEPENDENCIES rubocop-rspec (~> 1.5.0) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.16.2) + rugged (~> 0.24.0) sanitize (~> 2.0) sass-rails (~> 5.0.6) scss_lint (~> 0.47.0) @@ -988,4 +983,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.13.6 + 1.13.7 |