diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-01 17:21:45 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-01 17:21:45 +0300 |
| commit | 2ef16e76609e04a398a88c9704abf41795e452de (patch) | |
| tree | 29529391602a163be80acf6706e9abb2aaef1791 /Gemfile.lock | |
| parent | 26be65337cce7ba5d6421e252397ec3c09c32fa0 (diff) | |
| parent | 780bac1026f96d68d8c658ead605c61a5b018f62 (diff) | |
Merge branch 'gitlab-git-http-server' into 'master'
Replace grack with gitlab-git-http-server
See merge request !1229
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1772500d659..2450b95d973 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -263,8 +263,6 @@ GEM flowdock (~> 0.7) gitlab-grit (>= 2.4.1) multi_json - gitlab-grack (2.0.2) - rack (~> 1.5.1) gitlab-grit (2.7.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) @@ -787,7 +785,6 @@ DEPENDENCIES gemnasium-gitlab-service (~> 0.2) github-markup gitlab-flowdock-git-hook (~> 1.0.1) - gitlab-grack (~> 2.0.2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) gitlab_git (~> 7.2.15) @@ -881,6 +878,3 @@ DEPENDENCIES virtus webmock (~> 1.21.0) wikicloth (= 0.8.1) - -BUNDLED WITH - 1.10.6 |