diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-11-19 08:33:54 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-11-19 08:33:54 +0000 |
| commit | 96fb16743debfe0bd1ea88248eef9ad13b605c4b (patch) | |
| tree | f687bade74b3dd027d981b277937481879e58356 /Gemfile.rails4.lock | |
| parent | f1cf655021e784fdebd2da926040d1cf443d362a (diff) | |
| parent | d991ea6dddaa1ffaab5c9205bdfdc730c24b09b3 (diff) | |
| download | gitlab-ce-96fb16743debfe0bd1ea88248eef9ad13b605c4b.tar.gz | |
Merge branch 'sh-use-nakayoshi-fork' into 'master'
Improve memory performance by reducing dirty pages before fork
See merge request gitlab-org/gitlab-ce!23169
Diffstat (limited to 'Gemfile.rails4.lock')
| -rw-r--r-- | Gemfile.rails4.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock index 428ffafce98..62f4f378245 100644 --- a/Gemfile.rails4.lock +++ b/Gemfile.rails4.lock @@ -467,6 +467,7 @@ GEM mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) + nakayoshi_fork (0.0.4) net-ldap (0.16.0) net-ssh (5.0.1) netrc (0.11.0) @@ -1042,6 +1043,7 @@ DEPENDENCIES mini_magick minitest (~> 5.7.0) mysql2 (~> 0.4.10) + nakayoshi_fork (~> 0.0.4) net-ldap net-ssh (~> 5.0) nokogiri (~> 1.8.2) |