diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 18:08:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 18:08:51 +0300 |
commit | 1ea1db491c8bc90789acda45c9002aaa5c4dc498 (patch) | |
tree | 46d974fed38f2ea63e69bad9d43760c62611c958 /doc/user/project | |
parent | 22e9af3c8b8aedf7f46b786be968862b74a2d07e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project')
-rw-r--r-- | doc/user/project/releases/img/releases_count_v12_8.png | bin | 0 -> 92444 bytes | |||
-rw-r--r-- | doc/user/project/releases/index.md | 13 | ||||
-rw-r--r-- | doc/user/project/repository/forking_workflow.md | 4 | ||||
-rw-r--r-- | doc/user/project/repository/web_editor.md | 3 | ||||
-rw-r--r-- | doc/user/project/settings/index.md | 36 |
5 files changed, 46 insertions, 10 deletions
diff --git a/doc/user/project/releases/img/releases_count_v12_8.png b/doc/user/project/releases/img/releases_count_v12_8.png Binary files differnew file mode 100644 index 00000000000..fae3b58d8e3 --- /dev/null +++ b/doc/user/project/releases/img/releases_count_v12_8.png diff --git a/doc/user/project/releases/index.md b/doc/user/project/releases/index.md index c253210af46..d9eda5cf6a4 100644 --- a/doc/user/project/releases/index.md +++ b/doc/user/project/releases/index.md @@ -94,6 +94,19 @@ project. ![Releases list](img/releases.png) +### Number of Releases + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/36667) in GitLab 12.8. + +The incremental number of Releases is displayed on the project's details page. When clicked, +it takes you to the list of Releases. + +![Number of Releases](img/releases_count_v12_8.png "Incremental counter of Releases") + +For private projects, the number of Releases is displayed to users with Reporter +[permissions](../../permissions.md#releases-permissions) or higher. For public projects, +it is displayed to every user regardless of their permission level. + ## Editing a release > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/26016) in GitLab 12.6. diff --git a/doc/user/project/repository/forking_workflow.md b/doc/user/project/repository/forking_workflow.md index 8aa2e0dce37..cd23f0bd434 100644 --- a/doc/user/project/repository/forking_workflow.md +++ b/doc/user/project/repository/forking_workflow.md @@ -60,4 +60,8 @@ changes will be added to the repository and branch you're merging into. ![New merge request](img/forking_workflow_merge_request.png) +## Removing a fork relationship + +You can unlink your fork from its upstream project in the [advanced settings](../settings/index.md#removing-a-fork-relationship). + [gitlab flow]: https://about.gitlab.com/blog/2014/09/29/gitlab-flow/ "GitLab Flow blog post" diff --git a/doc/user/project/repository/web_editor.md b/doc/user/project/repository/web_editor.md index f41ff12d0a4..d847f4ddaaf 100644 --- a/doc/user/project/repository/web_editor.md +++ b/doc/user/project/repository/web_editor.md @@ -97,7 +97,8 @@ In case your development workflow dictates to have an issue for every merge request, you can quickly create a branch right on the issue page which will be tied with the issue itself. You can see a **Create merge request** dropdown below the issue description unless there is already a branch with the same -name or a referenced merge request. +name or a referenced merge request or your project (still) has an active +[fork relationship](../settings/index.md#advanced-settings). ![Create Button](img/web_editor_new_branch_from_issue_create_button_v12_6.png) diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index b4d4ec7a922..248c0e67520 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -1,8 +1,8 @@ # Project settings NOTE: **Note:** -Only project Maintainers and Admin users have the [permissions] to access a project -settings. +Only project Maintainers and Admin users have the [permissions](../../permissions.md#project-members-permissions) +to access a project settings. You can adjust your [project](../index.md) settings by navigating to your project's homepage and clicking **Settings**. @@ -106,12 +106,13 @@ Learn how to [export a project](import_export.md#importing-the-project) in GitLa ### Advanced settings -Here you can run housekeeping, archive, rename, transfer, or remove a project. +Here you can run housekeeping, archive, rename, transfer, [remove a fork relationship](#removing-a-fork-relationship), or remove a project. #### Archiving a project NOTE: **Note:** -Only project Owners and Admin users have the [permissions] to archive a project. +Only project Owners and Admin users have the [permissions](../../permissions.md#project-members-permissions) +to archive a project. Archiving a project makes it read-only for all users and indicates that it is no longer actively maintained. Projects that have been archived can also be @@ -130,7 +131,7 @@ To archive a project: #### Renaming a repository NOTE: **Note:** -Only project Maintainers and Admin users have the [permissions] to rename a +Only project Maintainers and Admin users have the [permissions](../../permissions.md#project-members-permissions) to rename a repository. Not to be confused with a project's name where it can also be changed from the [general project settings](#general-project-settings). @@ -150,11 +151,12 @@ old URL will not be able to push or pull. Read more about what happens with the #### Transferring an existing project into another namespace NOTE: **Note:** -Only project Owners and Admin users have the [permissions] to transfer a project. +Only project Owners and Admin users have the [permissions](../../permissions.md#project-members-permissions) +to transfer a project. You can transfer an existing project into a [group](../../group/index.md) if: -1. You have at least **Maintainer** [permissions] to that group. +1. You have at least **Maintainer** [permissions](../../permissions.md#project-members-permissions) to that group. 1. The project is in a subgroup you own. 1. You are at least a **Maintainer** of the project under your personal namespace. Similarly, if you are an owner of a group, you can transfer any of its projects @@ -175,8 +177,6 @@ NOTE: **Note:** GitLab administrators can use the admin interface to move any project to any namespace if needed. -[permissions]: ../../permissions.md#project-members-permissions - #### Remove a project NOTE: **Note:** @@ -202,6 +202,24 @@ To restore a project that is marked for deletion: 1. Navigate to your project, and select **{settings}** **Settings > General > Advanced**. 1. In the Restore project section, click the **Restore project** button. +#### Removing a fork relationship + +Forking is a great way to [contribute to a project](../repository/forking_workflow.md) +of which you are not a member. +If you want to use the fork for yourself and do not need to send +[merge requests](../merge_requests.md) to the upstream project, +you can safely remove the fork relationship. + +To do so: + +1. Navigate to your project's **Settings > General > Advanced**. +1. Under **Remove fork relationship**, click the likewise-labeled button. +1. Confirm the action by typing the project's path as instructed. + +NOTE: **Note:** +Only project maintainers have the [permissions](../../permissions.md#project-members-permissions) +to remove a fork relationship. + ## Operations settings ### Error Tracking |