Merge branch 'patch-16' into 'master'

docs: Expand fork relationship documentation

See merge request gitlab-org/gitlab!22601

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"

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)
 

doc/user/project/settings/index.md

 # 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