Commit 9386c5d5 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch '346160-update-create-merge-request-text' into 'master'

Change button text

See merge request gitlab-org/gitlab!77189
parents f8fb9e20 70cfc2fd
...@@ -254,14 +254,14 @@ NOTE: ...@@ -254,14 +254,14 @@ NOTE:
Only project Owners have the [permissions](../../permissions.md#project-members-permissions) Only project Owners have the [permissions](../../permissions.md#project-members-permissions)
to select Security Policy Project. to select Security Policy Project.
Once your policy is complete, save it by selecting **Create merge request** Once your policy is complete, save it by selecting **Create via merge request**
at the bottom of the editor. You are redirected to the merge request on the project's at the bottom of the editor. You are redirected to the merge request on the project's
configured security policy project. If one does not link to your project, a security configured security policy project. If one does not link to your project, a security
policy project is automatically created. Existing policies can also be policy project is automatically created. Existing policies can also be
removed from the editor interface by selecting **Delete policy** removed from the editor interface by selecting **Delete policy**
at the bottom of the editor. at the bottom of the editor.
![Scan Execution Policy Editor YAML Mode](img/scan_execution_policy_yaml_mode_v14_3.png) ![Scan Execution Policy Editor YAML Mode](img/scan_execution_policy_yaml_mode_v14_7.png)
The policy editor currently only supports the YAML mode. The Rule mode is tracked in the [Allow Users to Edit Rule-mode Scan Execution Policies in the Policy UI](https://gitlab.com/groups/gitlab-org/-/epics/5363) epic. The policy editor currently only supports the YAML mode. The Rule mode is tracked in the [Allow Users to Edit Rule-mode Scan Execution Policies in the Policy UI](https://gitlab.com/groups/gitlab-org/-/epics/5363) epic.
......
...@@ -19,7 +19,7 @@ export default { ...@@ -19,7 +19,7 @@ export default {
DEFAULT_EDITOR_MODE: EDITOR_MODE_YAML, DEFAULT_EDITOR_MODE: EDITOR_MODE_YAML,
EDITOR_MODES: [EDITOR_MODES[1]], EDITOR_MODES: [EDITOR_MODES[1]],
i18n: { i18n: {
createMergeRequest: __('Create merge request'), createMergeRequest: __('Create via merge request'),
notOwnerButtonText: __('Learn more'), notOwnerButtonText: __('Learn more'),
notOwnerDescription: s__( notOwnerDescription: s__(
'SecurityOrchestration|Scan execution policies can only be created by project owners.', 'SecurityOrchestration|Scan execution policies can only be created by project owners.',
......
...@@ -10084,6 +10084,9 @@ msgstr "" ...@@ -10084,6 +10084,9 @@ msgstr ""
msgid "Create user" msgid "Create user"
msgstr "" msgstr ""
msgid "Create via merge request"
msgstr ""
msgid "Create wildcard: %{searchTerm}" msgid "Create wildcard: %{searchTerm}"
msgstr "" msgstr ""
......
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