summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-17 03:09:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-17 03:09:27 +0000
commit9345f69894862e02f3491ea3136c3ed2b23fd5b8 (patch)
tree08a4a1b2861cd5894e2a1146300a206071f06ea3 /changelogs
parentd43aaf286fe6b8e8383e73ea580274d8841608d7 (diff)
downloadgitlab-ce-9345f69894862e02f3491ea3136c3ed2b23fd5b8.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/pokstad1-remove-branch-user-squash.yml5
-rw-r--r--changelogs/unreleased/sh-ensure-fresh-project-settings.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/pokstad1-remove-branch-user-squash.yml b/changelogs/unreleased/pokstad1-remove-branch-user-squash.yml
new file mode 100644
index 00000000000..60efd000094
--- /dev/null
+++ b/changelogs/unreleased/pokstad1-remove-branch-user-squash.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade Gitaly gem and fix UserSquash RPC usage
+merge_request: 27372
+author:
+type: other
diff --git a/changelogs/unreleased/sh-ensure-fresh-project-settings.yml b/changelogs/unreleased/sh-ensure-fresh-project-settings.yml
new file mode 100644
index 00000000000..9b37d06f75b
--- /dev/null
+++ b/changelogs/unreleased/sh-ensure-fresh-project-settings.yml
@@ -0,0 +1,5 @@
+---
+title: Ensure freshness of settings with project creation
+merge_request: 27156
+author:
+type: fixed