diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-13 18:06:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-13 18:06:51 +0000 |
commit | 57e3d49fc0fb99f42ac178761fc6232715734020 (patch) | |
tree | 756c435c2f5ec85bb2781fe28789b6f63999aac7 /doc/user | |
parent | 3318518149062e5d17105f2170bd7bd9647af415 (diff) | |
download | gitlab-ce-57e3d49fc0fb99f42ac178761fc6232715734020.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/group/index.md | 12 | ||||
-rw-r--r-- | doc/user/markdown.md | 1 | ||||
-rw-r--r-- | doc/user/search/img/issue_search_filter_v12_5.png | bin | 0 -> 504590 bytes | |||
-rw-r--r-- | doc/user/search/index.md | 7 |
4 files changed, 11 insertions, 9 deletions
diff --git a/doc/user/group/index.md b/doc/user/group/index.md index 934fbb28a6c..5f45a462f94 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -123,7 +123,7 @@ For more details on creating groups, watch the video [GitLab Namespaces (users, ## Add users to a group A benefit of putting multiple projects in one group is that you can -give a user to access to all projects in the group with one action. +give a user access to all projects in the group with one action. Add members to a group by navigating to the group's dashboard and clicking **Members**. @@ -135,14 +135,14 @@ Consider a group with two projects: - On the **Group Members** page, you can now add a new user to the group. - Now, because this user is a **Developer** member of the group, they automatically - gets **Developer** access to **all projects** within that group. + get **Developer** access to **all projects** within that group. To increase the access level of an existing user for a specific project, add them again as a new member to the project with the desired permission level. ## Request access to a group -As a group owner, you can enable or disable the ability for non members to request access to +As a group owner, you can enable or disable the ability for non-members to request access to your group. Go to the group settings, and click **Allow users to request access**. As a user, you can request to be a member of a group, if that setting is enabled. Go to the group for which you'd like to be a member, and click the **Request Access** button on the right @@ -356,7 +356,7 @@ Restriction currently applies to: - [From GitLab 12.3](https://gitlab.com/gitlab-org/gitlab/issues/12874), API access. - [From GitLab 12.4](https://gitlab.com/gitlab-org/gitlab/issues/32113), Git actions via SSH. -To avoid accidental lock-out, admins and group owners are are able to access +To avoid accidental lock-out, admins and group owners are able to access the group regardless of the IP restriction. #### Allowed domain restriction **(PREMIUM)** @@ -385,7 +385,7 @@ Some domains cannot be restricted. These are the most popular public email domai To enable this feature: 1. Navigate to the group's **Settings > General** page. -1. Expand the **Permissions, LFS, 2FA** section, and enter domain name into **Restrict membership by email** field. +1. Expand the **Permissions, LFS, 2FA** section, and enter the domain name into **Restrict membership by email** field. 1. Click **Save changes**. This will enable the domain-checking for all new users added to the group from this moment on. @@ -445,7 +445,7 @@ To enable this feature: > [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/13294) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.0. -A group owner can check the aggregated storage usage for all the project in a group, sub-groups included, in the **Storage** tab of the **Usage Quotas** page available to the group page settings list. +A group owner can check the aggregated storage usage for all the projects in a group, sub-groups included, in the **Storage** tab of the **Usage Quotas** page available to the group page settings list. ![Group storage usage quota](img/group_storage_usage_quota.png) diff --git a/doc/user/markdown.md b/doc/user/markdown.md index 43974a51205..3bd0dcafc19 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -405,6 +405,7 @@ GFM will recognize the following: | label by ID | `~123` | `namespace/project~123` | `project~123` | | one-word label by name | `~bug` | `namespace/project~bug` | `project~bug` | | multi-word label by name | `~"feature request"` | `namespace/project~"feature request"` | `project~"feature request"` | +| scoped label by name | `~"priority::high"` | `namespace/project~"priority::high"` | `project~"priority::high"` | | project milestone by ID | `%123` | `namespace/project%123` | `project%123` | | one-word milestone by name | `%v1.23` | `namespace/project%v1.23` | `project%v1.23` | | multi-word milestone by name | `%"release candidate"` | `namespace/project%"release candidate"` | `project%"release candidate"` | diff --git a/doc/user/search/img/issue_search_filter_v12_5.png b/doc/user/search/img/issue_search_filter_v12_5.png Binary files differnew file mode 100644 index 00000000000..1e2dd3d98a3 --- /dev/null +++ b/doc/user/search/img/issue_search_filter_v12_5.png diff --git a/doc/user/search/index.md b/doc/user/search/index.md index 33f920440ac..bc31052b758 100644 --- a/doc/user/search/index.md +++ b/doc/user/search/index.md @@ -32,13 +32,14 @@ on the search field on the top-right of your screen: If you want to search for issues present in a specific project, navigate to a project's **Issues** tab, and click on the field **Search or filter results...**. It will display a dropdown menu, from which you can add filters per author, assignee, milestone, -label, weight, and 'my-reaction' (based on your emoji votes). When done, press **Enter** on your keyboard to filter the issues. +release, label, weight, confidentiality, and "my-reaction" (based on your emoji votes). +When done, press **Enter** on your keyboard to filter the issues. -![filter issues in a project](img/issue_search_filter.png) +![filter issues in a project](img/issue_search_filter_v12_5.png) The same process is valid for merge requests. Navigate to your project's **Merge Requests** tab, and click **Search or filter results...**. Merge requests can be filtered by author, assignee, -milestone, and label. +approver, milestone, release, label, "my-reaction", "work in progess" status, and target branch. ### Filtering by **None** / **Any** |