From fb994e98ecce2a1f1dfaa87c9c3de8535815813b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 15 Feb 2021 18:09:09 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- changelogs/unreleased/16950_improve_highlighting_for_diffs.yml | 5 ----- changelogs/unreleased/285464_improve_highlighting_for_diffs.yml | 5 +++++ .../unreleased/add-user-setting-for-opting-into-marketing-emails.yml | 5 +++++ changelogs/unreleased/ci-allow-deep-nesting-for-scripts.yml | 5 +++++ changelogs/unreleased/ph-ph-fixWidgetGraphqlPipelineWarnings.yml | 5 +++++ changelogs/unreleased/psi-board-list-highlight.yml | 5 +++++ 6 files changed, 25 insertions(+), 5 deletions(-) delete mode 100644 changelogs/unreleased/16950_improve_highlighting_for_diffs.yml create mode 100644 changelogs/unreleased/285464_improve_highlighting_for_diffs.yml create mode 100644 changelogs/unreleased/add-user-setting-for-opting-into-marketing-emails.yml create mode 100644 changelogs/unreleased/ci-allow-deep-nesting-for-scripts.yml create mode 100644 changelogs/unreleased/ph-ph-fixWidgetGraphqlPipelineWarnings.yml create mode 100644 changelogs/unreleased/psi-board-list-highlight.yml (limited to 'changelogs') diff --git a/changelogs/unreleased/16950_improve_highlighting_for_diffs.yml b/changelogs/unreleased/16950_improve_highlighting_for_diffs.yml deleted file mode 100644 index da487e91980..00000000000 --- a/changelogs/unreleased/16950_improve_highlighting_for_diffs.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improve highlighting for merge diffs -merge_request: 52499 -author: -type: added diff --git a/changelogs/unreleased/285464_improve_highlighting_for_diffs.yml b/changelogs/unreleased/285464_improve_highlighting_for_diffs.yml new file mode 100644 index 00000000000..1e6bf23b379 --- /dev/null +++ b/changelogs/unreleased/285464_improve_highlighting_for_diffs.yml @@ -0,0 +1,5 @@ +--- +title: Improve highlighting for merge diffs +merge_request: 53980 +author: +type: added diff --git a/changelogs/unreleased/add-user-setting-for-opting-into-marketing-emails.yml b/changelogs/unreleased/add-user-setting-for-opting-into-marketing-emails.yml new file mode 100644 index 00000000000..d169e43d047 --- /dev/null +++ b/changelogs/unreleased/add-user-setting-for-opting-into-marketing-emails.yml @@ -0,0 +1,5 @@ +--- +title: Add user setting for opting into marketing emails +merge_request: 53921 +author: +type: added diff --git a/changelogs/unreleased/ci-allow-deep-nesting-for-scripts.yml b/changelogs/unreleased/ci-allow-deep-nesting-for-scripts.yml new file mode 100644 index 00000000000..643957d7338 --- /dev/null +++ b/changelogs/unreleased/ci-allow-deep-nesting-for-scripts.yml @@ -0,0 +1,5 @@ +--- +title: Accept deeply nested arrays for CI script keyword +merge_request: 53737 +author: +type: changed diff --git a/changelogs/unreleased/ph-ph-fixWidgetGraphqlPipelineWarnings.yml b/changelogs/unreleased/ph-ph-fixWidgetGraphqlPipelineWarnings.yml new file mode 100644 index 00000000000..d0cb9490a9e --- /dev/null +++ b/changelogs/unreleased/ph-ph-fixWidgetGraphqlPipelineWarnings.yml @@ -0,0 +1,5 @@ +--- +title: Added warnings field to the pipelines GraphQL type +merge_request: 54089 +author: +type: added diff --git a/changelogs/unreleased/psi-board-list-highlight.yml b/changelogs/unreleased/psi-board-list-highlight.yml new file mode 100644 index 00000000000..e97f6696049 --- /dev/null +++ b/changelogs/unreleased/psi-board-list-highlight.yml @@ -0,0 +1,5 @@ +--- +title: Highlight board lists when they are added +merge_request: 53779 +author: +type: changed -- cgit v1.2.3