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
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-02 03:09:56 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-02 03:09:56 +0300
commit926711e4546e0cf845c6cbe5773076f2195357f0 (patch)
tree92edf881d2be503589848c218a85d2a584cf0d19 /doc
parentf7bc7dc5eafc4eef9043a3d1b2dcbc15ca76a571 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/administration/audit_events.md11
-rw-r--r--doc/administration/repository_storage_paths.md4
-rw-r--r--doc/api/projects.md25
-rw-r--r--doc/topics/git/bisect.md6
-rw-r--r--doc/topics/git/cherry_picking.md2
-rw-r--r--doc/topics/git/feature_branching.md6
-rw-r--r--doc/topics/git/getting_started.md6
-rw-r--r--doc/topics/git/git_add.md6
-rw-r--r--doc/topics/git/git_log.md6
-rw-r--r--doc/topics/git/merge_conflicts.md6
-rw-r--r--doc/topics/git/rollback_commits.md6
-rw-r--r--doc/topics/git/stash.md6
-rw-r--r--doc/topics/git/subtree.md6
-rw-r--r--doc/topics/git/tags.md2
-rw-r--r--doc/topics/git/unstage.md6
-rw-r--r--doc/user/clusters/management_project.md4
16 files changed, 70 insertions, 38 deletions
diff --git a/doc/administration/audit_events.md b/doc/administration/audit_events.md
index a7f4fc10655..52aa0f5ab4e 100644
--- a/doc/administration/audit_events.md
+++ b/doc/administration/audit_events.md
@@ -147,6 +147,17 @@ recorded:
Instance events can also be accessed via the [Instance Audit Events API](../api/audit_events.md#instance-audit-events).
+### Sign-in events **(FREE)**
+
+Successful sign-in events are the only Audit Events available at all tiers. To see
+successful sign-in events:
+
+1. Select your avatar.
+1. Select **Edit profile > Authentication log**.
+
+After upgrading from GitLab Free to a paid tier, successful sign-in events are the only Audit
+Events visible in Audit Events views until more events are logged.
+
### Missing events
Some events are not tracked in Audit Events. See the following
diff --git a/doc/administration/repository_storage_paths.md b/doc/administration/repository_storage_paths.md
index e46a010222f..7badfa12e3d 100644
--- a/doc/administration/repository_storage_paths.md
+++ b/doc/administration/repository_storage_paths.md
@@ -154,5 +154,5 @@ often it is chosen. That is, `(storage weight) / (sum of all weights) * 100 = ch
## Move repositories
-To move a repository to a different repository path, use the same process as
-[migrating to Gitaly Cluster](gitaly/praefect.md#migrate-to-gitaly-cluster).
+To move a repository to a different repository storage (for example, from `default` to `storage2`), use the
+same process as [migrating to Gitaly Cluster](gitaly/praefect.md#migrate-to-gitaly-cluster).
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 5b96bcb22e2..0f3d9cdd334 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -2597,3 +2597,28 @@ GET /projects/:id/snapshot
|-----------|----------------|------------------------|-------------|
| `id` | integer/string | **{check-circle}** Yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding). |
| `wiki` | boolean | **{dotted-circle}** No | Whether to download the wiki, rather than project, repository. |
+
+## Get the path to repository storage
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/29861) in GitLab 14.0.
+
+Get the path to repository storage for specified project. Available for administrators only.
+
+```plaintext
+GET /projects/:id/storage
+```
+
+| Attribute | Type | Required | Description |
+|--------------|----------------|------------------------|-------------|
+| `id` | integer/string | **{check-circle}** Yes | ID or [URL-encoded path of the project](README.md#namespaced-path-encoding). |
+
+```json
+[
+ {
+ "project_id": 1,
+ "disk_path": "@hashed/6b/86/6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b",
+ "created_at": "2012-10-12T17:04:47Z",
+ "repository_storage": "default"
+ }
+]
+```
diff --git a/doc/topics/git/bisect.md b/doc/topics/git/bisect.md
index 8af77031c93..e587a51ba17 100644
--- a/doc/topics/git/bisect.md
+++ b/doc/topics/git/bisect.md
@@ -1,11 +1,11 @@
---
-stage: none
-group: unassigned
+stage: Create
+group: Source Code
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
comments: false
---
-# Bisect
+# Bisect **(FREE)**
- Find a commit that introduced a bug
- Works through a process of elimination
diff --git a/doc/topics/git/cherry_picking.md b/doc/topics/git/cherry_picking.md
index 5a0867371bb..4a875e25e1b 100644
--- a/doc/topics/git/cherry_picking.md
+++ b/doc/topics/git/cherry_picking.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
comments: false
---
-# Cherry Pick
+# Cherry pick **(FREE)**
Given an existing commit on one branch, apply the change to another branch.
diff --git a/doc/topics/git/feature_branching.md b/doc/topics/git/feature_branching.md
index f6233bddb18..f0ded5511ee 100644
--- a/doc/topics/git/feature_branching.md
+++ b/doc/topics/git/feature_branching.md
@@ -1,11 +1,11 @@
---
-stage: none
-group: unassigned
+stage: Create
+group: Source Code
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
comments: false
---
-# Feature branching
+# Feature branching **(FREE)**
- Efficient parallel workflow for teams
- Develop each feature in a branch
diff --git a/doc/topics/git/getting_started.md b/doc/topics/git/getting_started.md
index 2c3d5fe15de..7e04eae622f 100644
--- a/doc/topics/git/getting_started.md
+++ b/doc/topics/git/getting_started.md
@@ -1,11 +1,11 @@
---
-stage: none
-group: unassigned
+stage: Create
+group: Source Code
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
comments: false
---
-# Getting Started
+# Getting started **(FREE)**
## Instantiating Repositories
diff --git a/doc/topics/git/git_add.md b/doc/topics/git/git_add.md
index d136b9151bc..e15a1e9a60d 100644
--- a/doc/topics/git/git_add.md
+++ b/doc/topics/git/git_add.md
@@ -1,11 +1,11 @@
---
-stage: none
-group: unassigned
+stage: Create
+group: Source Code
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
comments: false
---
-# Git Add
+# Git Add **(FREE)**
Adds content to the index or staging area.
diff --git a/doc/topics/git/git_log.md b/doc/topics/git/git_log.md
index ae4ae69ce76..3988d7f7ac9 100644
--- a/doc/topics/git/git_log.md
+++ b/doc/topics/git/git_log.md
@@ -1,11 +1,11 @@
---
-stage: none
-group: unassigned
+stage: Create
+group: Source Code
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
comments: false
---
-# Git Log
+# Git Log **(FREE)**
Git log lists commit history. It allows searching and filtering.
diff --git a/doc/topics/git/merge_conflicts.md b/doc/topics/git/merge_conflicts.md
index 66771559298..bf69190030c 100644
--- a/doc/topics/git/merge_conflicts.md
+++ b/doc/topics/git/merge_conflicts.md
@@ -1,11 +1,11 @@
---
-stage: none
-group: unassigned
+stage: Create
+group: Source Code
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
comments: false
---
-# Merge conflicts
+# Merge conflicts **(FREE)**
- Happen often
- Learning to fix conflicts is hard
diff --git a/doc/topics/git/rollback_commits.md b/doc/topics/git/rollback_commits.md
index 34c2d9687bb..478dce179d2 100644
--- a/doc/topics/git/rollback_commits.md
+++ b/doc/topics/git/rollback_commits.md
@@ -1,11 +1,11 @@
---
-stage: none
-group: unassigned
+stage: Create
+group: Source Code
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
comments: false
---
-# Rollback Commits
+# Rollback commits **(FREE)**
## Undo Commits
diff --git a/doc/topics/git/stash.md b/doc/topics/git/stash.md
index 051103e5f4b..d321795e034 100644
--- a/doc/topics/git/stash.md
+++ b/doc/topics/git/stash.md
@@ -1,11 +1,11 @@
---
-stage: none
-group: unassigned
+stage: Create
+group: Source Code
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
comments: false
---
-# Git Stash
+# Git Stash **(FREE)**
We use `git stash` to store our changes when they are not ready to be committed
and we need to change to a different branch.
diff --git a/doc/topics/git/subtree.md b/doc/topics/git/subtree.md
index 54461915a05..0bf89668405 100644
--- a/doc/topics/git/subtree.md
+++ b/doc/topics/git/subtree.md
@@ -1,11 +1,11 @@
---
-stage: none
-group: unassigned
+stage: Create
+group: Source Code
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
comments: false
---
-# Subtree
+# Subtree **(FREE)**
- Used when there are nested repositories.
- Not recommended when the amount of dependencies is too large.
diff --git a/doc/topics/git/tags.md b/doc/topics/git/tags.md
index 70580ecf778..6e0622273bb 100644
--- a/doc/topics/git/tags.md
+++ b/doc/topics/git/tags.md
@@ -4,7 +4,7 @@ group: Source Code
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
---
-# Tags
+# Tags **(FREE)**
Tags are useful for marking certain deployments and releases for later
reference. Git supports two types of tags:
diff --git a/doc/topics/git/unstage.md b/doc/topics/git/unstage.md
index 30d26854135..b5f7c01de24 100644
--- a/doc/topics/git/unstage.md
+++ b/doc/topics/git/unstage.md
@@ -1,11 +1,11 @@
---
-stage: none
-group: unassigned
+stage: Create
+group: Source Code
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
comments: false
---
-# Unstage
+# Unstage **(FREE)**
- To remove files from stage use reset HEAD where HEAD is the last commit of the current branch. This unstages the file but maintain the modifications.
diff --git a/doc/user/clusters/management_project.md b/doc/user/clusters/management_project.md
index e728577e194..0a24bca67a5 100644
--- a/doc/user/clusters/management_project.md
+++ b/doc/user/clusters/management_project.md
@@ -6,10 +6,6 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# Cluster management project **(FREE)**
-WARNING:
-This is an _alpha_ feature, and it is subject to change at any time without
-prior notice.
-
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/32810) in GitLab 12.5
A project can be designated as the management project for a cluster.