summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 09:09:25 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 09:09:25 +0000
commit6f7881ee9dcec34141a8f34fc814b56b366d2b48 (patch)
tree25f72a06874b32b1049b79a9d7f4f1b7bca43b9b /changelogs
parent8c8bf44fa64f98114f7439f751c92d59a44b3218 (diff)
downloadgitlab-ce-6f7881ee9dcec34141a8f34fc814b56b366d2b48.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/fix_logic_for_ingress_can_uninstall.yml5
-rw-r--r--changelogs/unreleased/pokstad1-praefect-docs-reconcile-subcmd.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix_logic_for_ingress_can_uninstall.yml b/changelogs/unreleased/fix_logic_for_ingress_can_uninstall.yml
new file mode 100644
index 00000000000..64a7b22a62e
--- /dev/null
+++ b/changelogs/unreleased/fix_logic_for_ingress_can_uninstall.yml
@@ -0,0 +1,5 @@
+---
+title: Fix logic for ingress can_uninstall?
+merge_request: 27729
+author:
+type: fixed
diff --git a/changelogs/unreleased/pokstad1-praefect-docs-reconcile-subcmd.yml b/changelogs/unreleased/pokstad1-praefect-docs-reconcile-subcmd.yml
new file mode 100644
index 00000000000..2c20f425d80
--- /dev/null
+++ b/changelogs/unreleased/pokstad1-praefect-docs-reconcile-subcmd.yml
@@ -0,0 +1,5 @@
+---
+title: Update Gitaly to 12.9.0-rc5
+merge_request: 27631
+author:
+type: added