mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-22 11:06:10 +10:00
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
This commit is contained in:
@@ -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"
|
||||
|
||||
+2
-2
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user