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
0f75e95f
Commit
0f75e95f
authored
Aug 21, 2019
by
Samantha Ming
Committed by
Kushal Pandya
Aug 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start fix of rename approval rule
(reword commit message to pass pipeline danger-review error)
parent
87662bdb
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
2 deletions
+10
-2
ee/app/assets/javascripts/approvals/components/rule_form.vue
ee/app/assets/javascripts/approvals/components/rule_form.vue
+1
-1
ee/changelogs/unreleased/65631-rename-approval-rule.yml
ee/changelogs/unreleased/65631-rename-approval-rule.yml
+5
-0
ee/spec/features/merge_request/user_edits_approval_rules_mr_spec.rb
...atures/merge_request/user_edits_approval_rules_mr_spec.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
ee/app/assets/javascripts/approvals/components/rule_form.vue
View file @
0f75e95f
...
...
@@ -222,7 +222,7 @@ export default {
<div
class=
"row"
>
<div
v-if=
"settings.allowMultiRule"
class=
"form-group col-sm-6"
>
<label
class=
"label-wrapper"
>
<span
class=
"mb-2 bold inline"
>
{{
s__
(
'
ApprovalRule|
N
ame
'
)
}}
</span>
<span
class=
"mb-2 bold inline"
>
{{
s__
(
'
ApprovalRule|
Rule n
ame
'
)
}}
</span>
<input
v-model=
"name"
:class=
"
{ 'is-invalid': validation.name }"
...
...
ee/changelogs/unreleased/65631-rename-approval-rule.yml
0 → 100644
View file @
0f75e95f
---
title
:
Rename approval rule
merge_request
:
15140
author
:
type
:
other
ee/spec/features/merge_request/user_edits_approval_rules_mr_spec.rb
View file @
0f75e95f
...
...
@@ -53,7 +53,7 @@ describe 'Merge request > User edits MR with approval rules', :js do
click_button
"Add approvers"
fill_in
"
N
ame"
,
with:
rule_name
fill_in
"
Rule n
ame"
,
with:
rule_name
add_approval_rule_member
(
'user'
,
approver
.
name
)
...
...
locale/gitlab.pot
View file @
0f75e95f
...
...
@@ -1659,6 +1659,9 @@ msgstr ""
msgid "ApprovalRule|No. approvals required"
msgstr ""
msgid "ApprovalRule|Rule name"
msgstr ""
msgid "ApprovalRule|e.g. QA, Security, etc."
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