Commit fb725fd6 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'defect/fork-general-settings-copy' into 'master'

Change wording on the project remove fork page

See merge request gitlab-org/gitlab!47878
parents b8b43c5e 0efa8c3a
...@@ -6,5 +6,5 @@ ...@@ -6,5 +6,5 @@
= form_for @project, url: remove_fork_project_path(@project), method: :delete, remote: true, html: { class: 'transfer-project' } do |f| = form_for @project, url: remove_fork_project_path(@project), method: :delete, remote: true, html: { class: 'transfer-project' } do |f|
%p %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) } = button_to _('Remove fork relationship'), '#', class: "gl-button btn btn-danger js-confirm-danger", data: { "confirm-danger-message" => remove_fork_project_warning_message(@project) }
---
title: Change wording on the project remove fork page
merge_request: 47878
author:
type: other
...@@ -112,7 +112,7 @@ name or a referenced merge request or your project has an active ...@@ -112,7 +112,7 @@ name or a referenced merge request or your project has an active
fork relationship. fork relationship.
If you would like to make this button appear, a possible workaround is to [remove your project's 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 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) ![Create Button](img/web_editor_new_branch_from_issue_create_button_v12_6.png)
......
...@@ -18967,7 +18967,7 @@ msgstr "" ...@@ -18967,7 +18967,7 @@ msgstr ""
msgid "Once imported, repositories can be mirrored over SSH. Read more %{link_start}here%{link_end}." msgid "Once imported, repositories can be mirrored over SSH. Read more %{link_start}here%{link_end}."
msgstr "" 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 "" 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." 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."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment