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
4aaca884
Commit
4aaca884
authored
Aug 15, 2020
by
Fernando
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor security rule rows part I
* Move rows into seperate table
parent
bb319f74
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
44 deletions
+47
-44
ee/app/assets/javascripts/approvals/components/project_settings/project_rules.vue
...s/approvals/components/project_settings/project_rules.vue
+46
-43
ee/app/assets/javascripts/approvals/components/security_configuration/unconfigured_security_rule.vue
...nts/security_configuration/unconfigured_security_rule.vue
+1
-1
No files found.
ee/app/assets/javascripts/approvals/components/project_settings/project_rules.vue
View file @
4aaca884
...
@@ -165,6 +165,7 @@ export default {
...
@@ -165,6 +165,7 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div>
<rules
:rules=
"rules"
>
<rules
:rules=
"rules"
>
<template
#thead
="
{ name, members, approvalsRequired, branches }">
<template
#thead
="
{ name, members, approvalsRequired, branches }">
<tr
class=
"d-none d-sm-table-row"
>
<tr
class=
"d-none d-sm-table-row"
>
...
@@ -204,9 +205,11 @@ export default {
...
@@ -204,9 +205,11 @@ export default {
</td>
</td>
</tr>
</tr>
</
template
>
</
template
>
</template>
</rules>
<!-- TODO: Remove feature flag in https://gitlab.com/gitlab-org/gitlab/-/issues/235114 -->
<!-- TODO: Remove feature flag in https://gitlab.com/gitlab-org/gitlab/-/issues/235114 -->
<
template
v-if=
"glFeatures.approvalSuggestions"
>
<table
class=
"table m-0"
v-if=
"glFeatures.approvalSuggestions"
>
<tbody>
<unconfigured-security-rule
<unconfigured-security-rule
v-for=
"securityRule in securityRules"
v-for=
"securityRule in securityRules"
:key=
"securityRule.name"
:key=
"securityRule.name"
...
@@ -216,7 +219,7 @@ export default {
...
@@ -216,7 +219,7 @@ export default {
:match-rule=
"securityRule"
:match-rule=
"securityRule"
@
enable=
"openCreateModal({ defaultRuleName: securityRule.name })"
@
enable=
"openCreateModal({ defaultRuleName: securityRule.name })"
/>
/>
</
t
emplate
>
</t
body
>
</t
emplat
e>
</t
abl
e>
</
rules
>
</
div
>
</template>
</template>
ee/app/assets/javascripts/approvals/components/security_configuration/unconfigured_security_rule.vue
View file @
4aaca884
...
@@ -94,7 +94,7 @@ export default {
...
@@ -94,7 +94,7 @@ export default {
</td>
</td>
</template>
</template>
<td
v-else
class=
"js-name"
colspan=
"
3
"
>
<td
v-else
class=
"js-name"
colspan=
"
5
"
>
<div>
{{ matchRule.name }}
</div>
<div>
{{ matchRule.name }}
</div>
<div
class=
"gl-text-gray-500"
>
<div
class=
"gl-text-gray-500"
>
<gl-sprintf
:message=
"matchRule.description"
>
<gl-sprintf
:message=
"matchRule.description"
>
...
...
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