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-12-10 21:08:04 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-10 21:08:04 +0300
commit115c8ea7af7ef69ca3f09c333314546e9b5712f9 (patch)
treec3b6798c11e502f7d2785649f95d2255beac3c91 /changelogs
parent27d91a629918e417a9e87825e838209b9ace79c1 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/35368-add-doc-links-to-all-features-2.yml5
-rw-r--r--changelogs/unreleased/8248-remove-conan-feature-flag.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/35368-add-doc-links-to-all-features-2.yml b/changelogs/unreleased/35368-add-doc-links-to-all-features-2.yml
new file mode 100644
index 00000000000..d19b693aeff
--- /dev/null
+++ b/changelogs/unreleased/35368-add-doc-links-to-all-features-2.yml
@@ -0,0 +1,5 @@
+---
+title: Add doc links to features on admin dashboard
+merge_request: 21419
+author:
+type: changed
diff --git a/changelogs/unreleased/8248-remove-conan-feature-flag.yml b/changelogs/unreleased/8248-remove-conan-feature-flag.yml
new file mode 100644
index 00000000000..2c27bc0aaef
--- /dev/null
+++ b/changelogs/unreleased/8248-remove-conan-feature-flag.yml
@@ -0,0 +1,5 @@
+---
+title: Add support for Conan package management in the package registry
+merge_request: 21152
+author:
+type: added