diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-12-18 13:49:09 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-12-18 16:52:14 +0100 |
| commit | d27224ceca2b1eb0644f593157e398193bd3e2dc (patch) | |
| tree | 847bca768f6ffa6718d605d203e5b55bed78b363 /Gemfile.lock | |
| parent | 4db2e97bf401dbe7a3fdd928242926c146ab935b (diff) | |
| download | gitlab-ce-d27224ceca2b1eb0644f593157e398193bd3e2dc.tar.gz | |
Add unicorn-worker-killer with memory check
Conflicts:
Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6142d6ef8cf..8aad7c8c424 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -539,6 +539,8 @@ GEM kgio (~> 2.6) rack raindrops (~> 0.7) + unicorn-worker-killer (0.4.2) + unicorn (~> 4) virtus (1.0.1) axiom-types (~> 0.0.5) coercible (~> 1.0) @@ -660,4 +662,5 @@ DEPENDENCIES uglifier underscore-rails (~> 1.4.4) unicorn (~> 4.6.3) + unicorn-worker-killer webmock |