diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 09:08:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 09:08:31 +0000 |
| commit | a76d34e6716aa8267111ecdcd21416e9dec3a08d (patch) | |
| tree | 25876a46afec0af5b0d7168addb45e743d2a2128 /doc/user/project | |
| parent | 00bd11b166a886742f04d38c0d2551e52ff51472 (diff) | |
| download | gitlab-ce-a76d34e6716aa8267111ecdcd21416e9dec3a08d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project')
| -rw-r--r-- | doc/user/project/import/bitbucket_server.md | 2 | ||||
| -rw-r--r-- | doc/user/project/issues/issue_data_and_actions.md | 8 | ||||
| -rw-r--r-- | doc/user/project/labels.md | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/doc/user/project/import/bitbucket_server.md b/doc/user/project/import/bitbucket_server.md index fd62165053e..32f986890b9 100644 --- a/doc/user/project/import/bitbucket_server.md +++ b/doc/user/project/import/bitbucket_server.md @@ -39,7 +39,7 @@ Import your projects from Bitbucket Server to GitLab with minimal effort. The Bitbucket Server importer works as follows: -1. The user will be prompted to enter the URl, username, and password or personal access token to login to Bitbucket. +1. The user will be prompted to enter the URL, username, and password (or personal access token) to log in to Bitbucket. These credentials are preserved only as long as the importer is running. 1. The importer will attempt to list all the current repositories on the Bitbucket Server. 1. Upon selection, the importer will clone the repository and import pull requests and comments. diff --git a/doc/user/project/issues/issue_data_and_actions.md b/doc/user/project/issues/issue_data_and_actions.md index 8bb43b1231f..d6576fc780d 100644 --- a/doc/user/project/issues/issue_data_and_actions.md +++ b/doc/user/project/issues/issue_data_and_actions.md @@ -200,8 +200,12 @@ to let them know your reaction without spamming them. #### 21. Show all activity You can filter what is displayed in the issue history by clicking on **Show all activity** -and selecting either **Show comments only**, which only shows threads and hides -updates to the issue, or **Show history only**, which hides threads and only shows updates. +and selecting either: + +- **Show comments only**, which only shows threads and hides updates to the issue. +- **Show history only**, which hides threads and only shows updates. + +Also: - You can mention a user or a group present in your GitLab instance with `@username` or `@groupname` and they will be notified via To-Do items diff --git a/doc/user/project/labels.md b/doc/user/project/labels.md index a5a7fc34ef9..cd106b062f4 100644 --- a/doc/user/project/labels.md +++ b/doc/user/project/labels.md @@ -210,7 +210,7 @@ means higher priority.  -On the epic, merge request, and issue list pages, for both groups and projects, you +On the epic, merge request, and issue list pages (for both groups and projects) you can sort by `Label priority` or `Priority`. If you sort by `Label priority`, GitLab uses this sort comparison order: |