summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-26 21:07:52 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-26 21:07:52 +0000
commit03a70b84edfb86bc27f9234e1f1d157d3a33c555 (patch)
treed8df46fee3e5a97d3b9dbd7d2e69ccc9e3601de1 /changelogs
parent165beade336f9049f95db3944b1c5c00a1e952cf (diff)
downloadgitlab-ce-03a70b84edfb86bc27f9234e1f1d157d3a33c555.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/199422-maximum-size-for-gitlab-pages-says-to-set-it-to-0-for-unlimited-bu.yml5
-rw-r--r--changelogs/unreleased/share-redis-cache-connection-pool.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/199422-maximum-size-for-gitlab-pages-says-to-set-it-to-0-for-unlimited-bu.yml b/changelogs/unreleased/199422-maximum-size-for-gitlab-pages-says-to-set-it-to-0-for-unlimited-bu.yml
new file mode 100644
index 00000000000..2942943a482
--- /dev/null
+++ b/changelogs/unreleased/199422-maximum-size-for-gitlab-pages-says-to-set-it-to-0-for-unlimited-bu.yml
@@ -0,0 +1,5 @@
+---
+title: Allow 0 for pages size limit setting in admin settings
+merge_request: 28086
+author:
+type: fixed
diff --git a/changelogs/unreleased/share-redis-cache-connection-pool.yml b/changelogs/unreleased/share-redis-cache-connection-pool.yml
new file mode 100644
index 00000000000..7463b6aa777
--- /dev/null
+++ b/changelogs/unreleased/share-redis-cache-connection-pool.yml
@@ -0,0 +1,5 @@
+---
+title: Make Rails.cache and Gitlab::Redis::Cache share the same Redis connection pool
+merge_request: 28074
+author:
+type: performance