Automatic merge of gitlab-org/gitlab-ce master

ba555273 · GitLab Bot · 20c4f75b · 27ae3c2a · ba555273 · ba555273
Commit ba555273 authored May 11, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

changelogs/unreleased/sh-update-process-mem.yml changelogs/unreleased/sh-update-process-mem.yml +5 -0

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -297,7 +297,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)

--- a/changelogs/unreleased/sh-update-process-mem.yml
+++ b/changelogs/unreleased/sh-update-process-mem.yml
+---
+title: Update get_process_mem to 0.2.3
+merge_request: 28248
+author:
+type: other