Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-11 12:06:43 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-11 12:06:43 +0300
commit0dea53d5e575c6c15ce7384da73b8d4a95b1c8cf (patch)
tree43eb08e897fbac74f151eb650bde6029b6280a6e /changelogs
parentb4e072cbaf808793bafff148b0ec9d47819f479e (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/sh-disable-pager-on-small-counts.yml5
-rw-r--r--changelogs/unreleased/user-friendly-instance-configuration.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-disable-pager-on-small-counts.yml b/changelogs/unreleased/sh-disable-pager-on-small-counts.yml
new file mode 100644
index 00000000000..1d86d9aaf94
--- /dev/null
+++ b/changelogs/unreleased/sh-disable-pager-on-small-counts.yml
@@ -0,0 +1,5 @@
+---
+title: Fix erroneous "No activities found" message
+merge_request: 18434
+author:
+type: fixed
diff --git a/changelogs/unreleased/user-friendly-instance-configuration.yml b/changelogs/unreleased/user-friendly-instance-configuration.yml
new file mode 100644
index 00000000000..07a0250dff9
--- /dev/null
+++ b/changelogs/unreleased/user-friendly-instance-configuration.yml
@@ -0,0 +1,5 @@
+---
+title: Make instance configuration user friendly
+merge_request: 18363
+author: Takuya Noguchi
+type: other