diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-05-11 04:31:04 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-05-11 04:31:04 +0000 |
| commit | 27ae3c2a6bfcffbdd8e3b5436cf46312882e0633 (patch) | |
| tree | d761515b0fdbdbc7ac063e657f8d8493a92d35b2 | |
| parent | 825b2bdafd76c1a6773f2ec2bf2b19487f64d4e7 (diff) | |
| parent | 21507517ada868caba5df8d1eb02b7635beb4e9e (diff) | |
| download | gitlab-ce-27ae3c2a6bfcffbdd8e3b5436cf46312882e0633.tar.gz | |
Merge branch 'sh-update-process-mem' into 'master'
Update get_process_mem to 0.2.3
See merge request gitlab-org/gitlab-ce!28248
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-update-process-mem.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3dd1adb5f63..2be35efe1da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -272,7 +272,7 @@ GEM ruby-progressbar (~> 1.4) gemojione (3.3.0) json - get_process_mem (0.2.0) + get_process_mem (0.2.3) gettext (3.2.9) locale (>= 2.0.5) text (>= 1.3.0) diff --git a/changelogs/unreleased/sh-update-process-mem.yml b/changelogs/unreleased/sh-update-process-mem.yml new file mode 100644 index 00000000000..51b22fb0f00 --- /dev/null +++ b/changelogs/unreleased/sh-update-process-mem.yml @@ -0,0 +1,5 @@ +--- +title: Update get_process_mem to 0.2.3 +merge_request: 28248 +author: +type: other |