Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9386c5d5
Commit
9386c5d5
authored
Dec 23, 2021
by
Natalia Tepluhina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '346160-update-create-merge-request-text' into 'master'
Change button text See merge request gitlab-org/gitlab!77189
parents
f8fb9e20
70cfc2fd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
3 deletions
+6
-3
doc/user/application_security/policies/img/scan_execution_policy_yaml_mode_v14_3.png
...ty/policies/img/scan_execution_policy_yaml_mode_v14_3.png
+0
-0
doc/user/application_security/policies/img/scan_execution_policy_yaml_mode_v14_7.png
...ty/policies/img/scan_execution_policy_yaml_mode_v14_7.png
+0
-0
doc/user/application_security/policies/index.md
doc/user/application_security/policies/index.md
+2
-2
ee/app/assets/javascripts/threat_monitoring/components/policy_editor/scan_execution_policy/scan_execution_policy_editor.vue
...or/scan_execution_policy/scan_execution_policy_editor.vue
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
doc/user/application_security/policies/img/scan_execution_policy_yaml_mode_v14_3.png
deleted
100644 → 0
View file @
f8fb9e20
23.1 KB
doc/user/application_security/policies/img/scan_execution_policy_yaml_mode_v14_7.png
0 → 100644
View file @
9386c5d5
24.8 KB
doc/user/application_security/policies/index.md
View file @
9386c5d5
...
...
@@ -254,14 +254,14 @@ NOTE:
Only project Owners have the [permissions](../../permissions.md#project-members-permissions)
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
configured security policy project. If one does not link to your project, a security
policy project is automatically created. Existing policies can also be
removed from the editor interface by selecting **Delete policy**
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.
...
...
ee/app/assets/javascripts/threat_monitoring/components/policy_editor/scan_execution_policy/scan_execution_policy_editor.vue
View file @
9386c5d5
...
...
@@ -19,7 +19,7 @@ export default {
DEFAULT_EDITOR_MODE
:
EDITOR_MODE_YAML
,
EDITOR_MODES
:
[
EDITOR_MODES
[
1
]],
i18n
:
{
createMergeRequest
:
__
(
'
Create merge request
'
),
createMergeRequest
:
__
(
'
Create
via
merge request
'
),
notOwnerButtonText
:
__
(
'
Learn more
'
),
notOwnerDescription
:
s__
(
'
SecurityOrchestration|Scan execution policies can only be created by project owners.
'
,
...
...
locale/gitlab.pot
View file @
9386c5d5
...
...
@@ -10084,6 +10084,9 @@ msgstr ""
msgid "Create user"
msgstr ""
msgid "Create via merge request"
msgstr ""
msgid "Create wildcard: %{searchTerm}"
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment