summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-04-04 13:41:58 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-04-04 13:41:58 +0000
commitb15dd5dfa2ac269763d6342d7f0b3d9a64eb7fe4 (patch)
tree020172331413472dcce1ad22aa669cf60d157bbc /changelogs
parent873a1d9364337b4de4665032a5841a162706d1d4 (diff)
parent6415ac9e994640474eaa5b0fee3914934d85b35b (diff)
downloadgitlab-ce-b15dd5dfa2ac269763d6342d7f0b3d9a64eb7fe4.tar.gz
Merge branch 'sh-gitlab-sidekiq-logger' into 'master'
Add support for Sidekiq JSON logging Closes #20060 See merge request gitlab-org/gitlab-ce!18121
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/sh-gitlab-sidekiq-logger.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-gitlab-sidekiq-logger.yml b/changelogs/unreleased/sh-gitlab-sidekiq-logger.yml
new file mode 100644
index 00000000000..f68d45d2f38
--- /dev/null
+++ b/changelogs/unreleased/sh-gitlab-sidekiq-logger.yml
@@ -0,0 +1,5 @@
+---
+title: Add support for Sidekiq JSON logging
+merge_request:
+author:
+type: added