From 41cb558299b483b44b45351730ee4c0e9fe4ca2c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 7 Apr 2020 09:09:13 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- ...13367-snippet-update-error-when-version-feature-flag-disabled.yml | 5 +++++ changelogs/unreleased/approval-by-me-icon.yml | 5 +++++ changelogs/unreleased/sh-flatten-sidekiq-exception-logs.yml | 5 +++++ 3 files changed, 15 insertions(+) create mode 100644 changelogs/unreleased/213367-snippet-update-error-when-version-feature-flag-disabled.yml create mode 100644 changelogs/unreleased/approval-by-me-icon.yml create mode 100644 changelogs/unreleased/sh-flatten-sidekiq-exception-logs.yml (limited to 'changelogs') diff --git a/changelogs/unreleased/213367-snippet-update-error-when-version-feature-flag-disabled.yml b/changelogs/unreleased/213367-snippet-update-error-when-version-feature-flag-disabled.yml new file mode 100644 index 00000000000..88915db6790 --- /dev/null +++ b/changelogs/unreleased/213367-snippet-update-error-when-version-feature-flag-disabled.yml @@ -0,0 +1,5 @@ +--- +title: Resolve Snippet update error with version flag disabled +merge_request: 28815 +author: +type: fixed diff --git a/changelogs/unreleased/approval-by-me-icon.yml b/changelogs/unreleased/approval-by-me-icon.yml new file mode 100644 index 00000000000..2ffe5718a9c --- /dev/null +++ b/changelogs/unreleased/approval-by-me-icon.yml @@ -0,0 +1,5 @@ +--- +title: Use different approval icon if current user approved +merge_request: 28290 +author: Steffen Köhler +type: changed diff --git a/changelogs/unreleased/sh-flatten-sidekiq-exception-logs.yml b/changelogs/unreleased/sh-flatten-sidekiq-exception-logs.yml new file mode 100644 index 00000000000..b46a3fea687 --- /dev/null +++ b/changelogs/unreleased/sh-flatten-sidekiq-exception-logs.yml @@ -0,0 +1,5 @@ +--- +title: Stringify Sidekiq job args in exception logs +merge_request: 28996 +author: +type: fixed -- cgit v1.2.3