diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-21 10:41:59 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-21 15:49:23 +0300 |
| commit | adcc20494883985fa2a36d8cdb4575c4fa62deff (patch) | |
| tree | cd006c0f515ab8b2a78ef17c3a3af72281ee92aa | |
| parent | 7915e74d3cb0f44ee663841e94d850eaa5ef0617 (diff) | |
| download | gitlab-ce-adcc20494883985fa2a36d8cdb4575c4fa62deff.tar.gz | |
Merge branch 'gitlab-grack-2.0.1' into 'master'
Update gitlab-grack to 2.0.1 to get unicorn to stop creating zombies.
Addresses #1461 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2253.
This regression was introduced between 7.9 and the 7.10 rcs, so no changelog item for 7.10 proper.
cc @JobV @jacobvosmaer
See merge request !546
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -42,7 +42,7 @@ gem "browser" gem "gitlab_git", '~> 7.1.10' # Ruby/Rack Git Smart-HTTP Server Handler -gem 'gitlab-grack', '~> 2.0.0.rc2', require: 'grack' +gem 'gitlab-grack', '~> 2.0.1', require: 'grack' # LDAP Auth gem 'gitlab_omniauth-ldap', '1.2.1', require: "omniauth-ldap" diff --git a/Gemfile.lock b/Gemfile.lock index 360b1abcf56..fbf0ef443a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,7 +199,7 @@ GEM gitlab-flowdock-git-hook (0.4.2.2) gitlab-grit (>= 2.4.1) multi_json - gitlab-grack (2.0.0) + gitlab-grack (2.0.1) rack (~> 1.5.1) gitlab-grit (2.7.2) charlock_holmes (~> 0.6) @@ -700,7 +700,7 @@ DEPENDENCIES gemnasium-gitlab-service (~> 0.2) github-markup gitlab-flowdock-git-hook (~> 0.4.2) - gitlab-grack (~> 2.0.0.rc2) + gitlab-grack (~> 2.0.1) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) gitlab_git (~> 7.1.10) |