summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-10 18:09:32 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-10 18:09:32 +0000
commitbac259ea8bb39318d1e2379b2099dbd2393b8f7a (patch)
tree61fa955f49b8f1ecd68bd247531f879231ffc208 /doc/user
parentd2091d1e924e2887eb9db4fad761965a24d024f1 (diff)
downloadgitlab-ce-bac259ea8bb39318d1e2379b2099dbd2393b8f7a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/group/import/index.md8
-rw-r--r--doc/user/packages/package_registry/index.md2
-rw-r--r--doc/user/project/description_templates.md4
-rw-r--r--doc/user/project/import/github.md5
-rw-r--r--doc/user/snippets.md4
5 files changed, 18 insertions, 5 deletions
diff --git a/doc/user/group/import/index.md b/doc/user/group/import/index.md
index 42439d27c83..7a7523d7c14 100644
--- a/doc/user/group/import/index.md
+++ b/doc/user/group/import/index.md
@@ -49,6 +49,14 @@ The following resources are migrated to the target instance:
- parent epic ([Introduced in 13.9](https://gitlab.com/gitlab-org/gitlab/-/issues/297459))
- emoji award ([Introduced in 13.9](https://gitlab.com/gitlab-org/gitlab/-/issues/297466))
- events ([Introduced in 13.10](https://gitlab.com/gitlab-org/gitlab/-/issues/297465))
+- Milestones ([Introduced in 13.10](https://gitlab.com/gitlab-org/gitlab/-/issues/292427))
+ - title
+ - description
+ - state (active / closed)
+ - start date
+ - due date
+ - created at
+ - updated at
Any other items are **not** migrated.
diff --git a/doc/user/packages/package_registry/index.md b/doc/user/packages/package_registry/index.md
index 19796de0f51..2fd05ac1748 100644
--- a/doc/user/packages/package_registry/index.md
+++ b/doc/user/packages/package_registry/index.md
@@ -4,7 +4,7 @@ group: Package
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
---
-# Package Registry
+# Package Registry **(FREE)**
> [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/221259) to GitLab Free in 13.3.
diff --git a/doc/user/project/description_templates.md b/doc/user/project/description_templates.md
index 307313ffb49..e3fa7ca6dc0 100644
--- a/doc/user/project/description_templates.md
+++ b/doc/user/project/description_templates.md
@@ -146,6 +146,10 @@ After you add the description, hit **Save changes** for the settings to take
effect. Now, every time a new merge request or issue is created, it is
pre-filled with the text you entered in the template(s).
+[GitLab versions 13.10 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/885)
+provide `issues_template` and `merge_requests_template` attributes in the
+[Projects API](../../api/projects.md) to help you keep your templates up to date.
+
## Description template example
We make use of description templates for issues and merge requests in the GitLab project.
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index 11b7f2445e7..eb426a9f126 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -49,8 +49,9 @@ The steps you take depend on whether you are importing from GitHub.com or GitHub
[GitHub Rake task](../../../administration/raketasks/github_import.md) to import
projects without the constraints of a [Sidekiq](../../../development/sidekiq_style_guide.md) worker.
- If you're importing from GitHub Enterprise to your self-managed GitLab instance, you must first enable
- [GitHub integration](../../../integration/github.md). However, you cannot import projects from GitHub Enterprise to GitLab.com.
-- If you're importing from GitHub.com to your self-managed GitLab instance, you do not need to set up GitHub integration.
+ [GitHub integration](../../../integration/github.md).
+ - To import projects from GitHub Enterprise to GitLab.com, use the [Import API](../../../api/import.md).
+- If you're importing from GitHub.com to your self-managed GitLab instance, you do not need to set up GitHub integration. You can use the [Import API](../../../api/import.md).
## How it works
diff --git a/doc/user/snippets.md b/doc/user/snippets.md
index 4750adeb1a3..30da6eceaf4 100644
--- a/doc/user/snippets.md
+++ b/doc/user/snippets.md
@@ -166,8 +166,8 @@ There are two main ways of how you can discover snippets in GitLab.
For exploring all snippets that are visible to you, you can go to the Snippets
dashboard of your GitLab instance via the top navigation. For GitLab.com you can
-navigate to an [overview]((https://gitlab.com/dashboard/snippets)) that shows snippets
-you created and allows you to explore all snippets.
+visit [GitLab Snippets](http://snippets.gitlab.com/) or navigate to an [overview]((https://gitlab.com/dashboard/snippets)) that shows snippets
+you created and allows you to explore all snippets.
To discover snippets that belong to a specific project, navigate
to the Snippets page via the left side navigation on the project page.