diff --git a/app/views/projects/_remove_fork.html.haml b/app/views/projects/_remove_fork.html.haml index 2f85376876fcd59acae68285f063ee749a406a0e..2a7453902a869b74e435a011007db98942cff55c 100644 --- a/app/views/projects/_remove_fork.html.haml +++ b/app/views/projects/_remove_fork.html.haml @@ -6,5 +6,5 @@ = form_for @project, url: remove_fork_project_path(@project), method: :delete, remote: true, html: { class: 'transfer-project' } do |f| %p - %strong= _('Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source.') + %strong= _('Once removed, the fork relationship cannot be restored. This project will no longer be able to receive or send merge requests to the source project or other forks.') = button_to _('Remove fork relationship'), '#', class: "gl-button btn btn-danger js-confirm-danger", data: { "confirm-danger-message" => remove_fork_project_warning_message(@project) } diff --git a/changelogs/unreleased/defect-fork-general-settings-copy.yml b/changelogs/unreleased/defect-fork-general-settings-copy.yml new file mode 100644 index 0000000000000000000000000000000000000000..02b38b5955de174e7259fecca2c97a7c2e71796a --- /dev/null +++ b/changelogs/unreleased/defect-fork-general-settings-copy.yml @@ -0,0 +1,5 @@ +--- +title: Change wording on the project remove fork page +merge_request: 47878 +author: +type: other diff --git a/doc/user/project/repository/web_editor.md b/doc/user/project/repository/web_editor.md index 10f33ee26316da1e66f562296606935042330bde..5b82cdbd9e9e7c91f77b7a87aa0bed8efafc705d 100644 --- a/doc/user/project/repository/web_editor.md +++ b/doc/user/project/repository/web_editor.md @@ -112,7 +112,7 @@ name or a referenced merge request or your project has an active fork relationship. If you would like to make this button appear, a possible workaround is to [remove your project's fork relationship](../settings/index.md#removing-a-fork-relationship). Once removed, the fork -relationship cannot be restored, and you will no longer be able to send merge requests to the source. +relationship cannot be restored. This project will no longer be able to receive or send merge requests to the source project or other forks. ![Create Button](img/web_editor_new_branch_from_issue_create_button_v12_6.png) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index cb0688504133a1f62495670a24656e9b35672551..193228da8930666a6190f54d86d8d0c9f3c758bc 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -18976,7 +18976,7 @@ msgstr "" msgid "Once imported, repositories can be mirrored over SSH. Read more %{link_start}here%{link_end}." msgstr "" -msgid "Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source." +msgid "Once removed, the fork relationship cannot be restored. This project will no longer be able to receive or send merge requests to the source project or other forks." msgstr "" msgid "Once the exported file is ready, you will receive a notification email with a download link, or you can download it from this page."