summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-23 00:09:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-23 00:09:51 +0000
commit71da67f3262eeffe59cc228986e0a2bb97b6dba5 (patch)
tree426845fe569787b0ab1b2bae573fb1ae8ccb6fe1 /doc
parentf2dfd9ee819afb07bf11bd36a5f9d23009be0d39 (diff)
downloadgitlab-ce-71da67f3262eeffe59cc228986e0a2bb97b6dba5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/ci_cd_for_external_repos/index.md4
-rw-r--r--doc/user/img/new_personal_snippet_from_project_v12_10.pngbin0 -> 77106 bytes
-rw-r--r--doc/user/img/new_personal_snippet_v12_10.pngbin0 -> 39878 bytes
-rw-r--r--doc/user/img/new_project_snippet_from_project_v12_10.pngbin0 -> 73848 bytes
-rw-r--r--doc/user/project/repository/repository_mirroring.md3
-rw-r--r--doc/user/snippets.md27
6 files changed, 27 insertions, 7 deletions
diff --git a/doc/ci/ci_cd_for_external_repos/index.md b/doc/ci/ci_cd_for_external_repos/index.md
index 25598241c9b..704894f51b3 100644
--- a/doc/ci/ci_cd_for_external_repos/index.md
+++ b/doc/ci/ci_cd_for_external_repos/index.md
@@ -6,10 +6,6 @@ type: index, howto
>[Introduced][ee-4642] in [GitLab Premium][eep] 10.6.
-NOTE: **Note:**
-This feature [is available for free](https://about.gitlab.com/blog/2019/09/09/ci-cd-github-extended-again/) to
-GitLab.com users until March 22nd, 2020.
-
GitLab CI/CD can be used with:
- [GitHub](github_integration.md).
diff --git a/doc/user/img/new_personal_snippet_from_project_v12_10.png b/doc/user/img/new_personal_snippet_from_project_v12_10.png
new file mode 100644
index 00000000000..af8cce01208
--- /dev/null
+++ b/doc/user/img/new_personal_snippet_from_project_v12_10.png
Binary files differ
diff --git a/doc/user/img/new_personal_snippet_v12_10.png b/doc/user/img/new_personal_snippet_v12_10.png
new file mode 100644
index 00000000000..a995e4d4b40
--- /dev/null
+++ b/doc/user/img/new_personal_snippet_v12_10.png
Binary files differ
diff --git a/doc/user/img/new_project_snippet_from_project_v12_10.png b/doc/user/img/new_project_snippet_from_project_v12_10.png
new file mode 100644
index 00000000000..7fa17beaae6
--- /dev/null
+++ b/doc/user/img/new_project_snippet_from_project_v12_10.png
Binary files differ
diff --git a/doc/user/project/repository/repository_mirroring.md b/doc/user/project/repository/repository_mirroring.md
index 33fa09255e1..7c28e956e12 100644
--- a/doc/user/project/repository/repository_mirroring.md
+++ b/doc/user/project/repository/repository_mirroring.md
@@ -110,9 +110,6 @@ The repository will push soon. To force a push, click the appropriate button.
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51) in GitLab Enterprise Edition 8.2.
> - [Added Git LFS support](https://gitlab.com/gitlab-org/gitlab/issues/10871) in [GitLab Starter](https://about.gitlab.com/pricing/) 11.11.
-NOTE: **Note:** This feature [is available for free](https://gitlab.com/gitlab-org/gitlab/issues/10361) to
-GitLab.com users until March 22nd, 2020.
-
You can set up a repository to automatically have its branches, tags, and commits updated from an
upstream repository.
diff --git a/doc/user/snippets.md b/doc/user/snippets.md
index 77997c53210..0372bb42038 100644
--- a/doc/user/snippets.md
+++ b/doc/user/snippets.md
@@ -22,6 +22,33 @@ and private. See [Public access](../public_access/public_access.md) for more inf
Project snippets are always related to a specific project.
See [Project features](project/index.md#project-features) for more information.
+## Create a snippet
+
+To create a personal snippet, click the plus icon (**{plus-square-o}**)
+on the top navigation and select **New snippet** from the dropdown menu:
+
+![New personal snippet from non-project pages](img/new_personal_snippet_v12_10.png)
+
+If you're on a project's page but you want to create a new personal snippet,
+click the plus icon (**{plus-square-o}**) and select **New snippet** from the
+lower part of the dropdown (**GitLab** on GitLab.com; **Your Instance** on
+self-managed instances):
+
+![New personal snippet from project pages](img/new_personal_snippet_from_project_v12_10.png)
+
+To create a project snippet, navigate to your project's page and click the
+plus icon (**{plus-square-o}**), then select **New snippet** from the upper
+part of the dropdown (**This project**).
+
+![New personal snippet from project pages](img/new_project_snippet_from_project_v12_10.png)
+
+From there, add the **Title**, **Description**, and a **File** name with the
+appropriate extension (for example, `example.rb`, `index.html`).
+
+CAUTION: **Warning:**
+Make sure to add the file name to get code highlighting and to avoid this
+[copy-pasting bug](https://gitlab.com/gitlab-org/gitlab/-/issues/22870).
+
## Discover snippets
There are two main ways of how you can discover snippets in GitLab.