From de6a44fae6273c44ef27ff55d13799efc9756acd Mon Sep 17 00:00:00 2001
From: Pascal Betz <pascal.betz@gmail.com>
Date: Wed, 7 Sep 2016 21:59:29 +0200
Subject: feedback code review

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index d06b782f850..21d3cc1435f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 8.12.0 (unreleased)
   - Change merge_error column from string to text type
   - Reduce contributions calendar data payload (ClemMakesApps)
   - Add `web_url` field to issue, merge request, and snippet API objects (Ben Boeckel)
+  - Move parsing of sidekiq ps into helper !6245 (pascalbetz)
   - Expose `sha` and `merge_commit_sha` in merge request API (Ben Boeckel)
   - Set path for all JavaScript cookies to honor GitLab's subdirectory setting !5627 (Mike Greiling)
   - Fix bug where pagination is still displayed despite all todos marked as done (ClemMakesApps)
-- 
cgit v1.2.1