summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-14 06:10:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-14 06:10:12 +0000
commitbfa9edfd26edc8800556399ebb4c52c5f61a69a6 (patch)
treee7969cdb4bba6b44581858627b0df6938e97f1c1 /changelogs
parentf5a8ebd6b7da5501100d66b43050be7b26b04665 (diff)
downloadgitlab-ce-bfa9edfd26edc8800556399ebb4c52c5f61a69a6.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/220964-rename-design-delete-button.yml5
-rw-r--r--changelogs/unreleased/min_limit_wiki_page.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/220964-rename-design-delete-button.yml b/changelogs/unreleased/220964-rename-design-delete-button.yml
new file mode 100644
index 00000000000..59e6747c90b
--- /dev/null
+++ b/changelogs/unreleased/220964-rename-design-delete-button.yml
@@ -0,0 +1,5 @@
+---
+title: "Re-name \"Delete\" button to \"Archive\" in Design Management"
+merge_request: 38446
+author: Getulio Valentin Sánchez @gvso
+type: changed
diff --git a/changelogs/unreleased/min_limit_wiki_page.yml b/changelogs/unreleased/min_limit_wiki_page.yml
new file mode 100644
index 00000000000..58987dfee1b
--- /dev/null
+++ b/changelogs/unreleased/min_limit_wiki_page.yml
@@ -0,0 +1,5 @@
+---
+title: Added minimum value of 1KB to wiki_page_max_content_bytes
+merge_request: 38554
+author: Uday Aggarwal (uday.agg97)
+type: changed