diff options
| author | Alejandro Rodríguez <alejorro70@gmail.com> | 2016-07-24 18:45:14 +0000 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2016-07-24 18:45:14 +0000 |
| commit | 3dc8075af5ea3796e8ff41f6616c94814abe5e3c (patch) | |
| tree | 48e7ef5273debe4ebdfce9d80c8a722ccc5ff4f0 /Gemfile.lock | |
| parent | fb362795ce5ed63a34cd5b832ece22e5f712d851 (diff) | |
| download | gitlab-ce-3dc8075af5ea3796e8ff41f6616c94814abe5e3c.tar.gz | |
Revert "Merge branch '17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…"
This reverts merge request !5375
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 195516d1bf1..e2b3d55ee0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,7 +274,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab_git (10.4.1) + gitlab_git (10.3.2) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) @@ -861,7 +861,7 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.4) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab_git (~> 10.4.1) + gitlab_git (~> 10.3.2) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) |