summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-11 09:06:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-11 09:06:38 +0000
commit4a45f0eff2a25c64bdd83926e35a8894a4f0469f (patch)
tree8068fff1731ccf4182605c2661c25f0a1c936866 /changelogs
parentd9c3a63a4394990bcdccbaca73c58278469236b4 (diff)
downloadgitlab-ce-4a45f0eff2a25c64bdd83926e35a8894a4f0469f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/34827-delete-container-registry-tag-undefined-method-success-for-nil.yml5
-rw-r--r--changelogs/unreleased/add-default-plan.yml5
-rw-r--r--changelogs/unreleased/mermaid-update.yml5
3 files changed, 15 insertions, 0 deletions
diff --git a/changelogs/unreleased/34827-delete-container-registry-tag-undefined-method-success-for-nil.yml b/changelogs/unreleased/34827-delete-container-registry-tag-undefined-method-success-for-nil.yml
new file mode 100644
index 00000000000..97f5fae95bb
--- /dev/null
+++ b/changelogs/unreleased/34827-delete-container-registry-tag-undefined-method-success-for-nil.yml
@@ -0,0 +1,5 @@
+---
+title: Fix crash when docker fails deleting tags
+merge_request: 19208
+author:
+type: fixed
diff --git a/changelogs/unreleased/add-default-plan.yml b/changelogs/unreleased/add-default-plan.yml
new file mode 100644
index 00000000000..0bcab9b2919
--- /dev/null
+++ b/changelogs/unreleased/add-default-plan.yml
@@ -0,0 +1,5 @@
+---
+title: Create explicit Default and Free plans
+merge_request: 19033
+author:
+type: other
diff --git a/changelogs/unreleased/mermaid-update.yml b/changelogs/unreleased/mermaid-update.yml
new file mode 100644
index 00000000000..33b0c1a551c
--- /dev/null
+++ b/changelogs/unreleased/mermaid-update.yml
@@ -0,0 +1,5 @@
+---
+title: Update to Mermaid v8.4.2 to support more graph types
+merge_request: 19444
+author:
+type: changed