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
1bf772da
Commit
1bf772da
authored
Apr 15, 2021
by
Justin Ho
Committed by
David O'Regan
Apr 28, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update button variants to confirm on MR page
Also update badge variant and add some spacing
parent
8ed012d0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/batch_comments/components/drafts_count.vue
...ts/javascripts/batch_comments/components/drafts_count.vue
+1
-1
app/assets/javascripts/batch_comments/components/publish_button.vue
.../javascripts/batch_comments/components/publish_button.vue
+1
-1
app/assets/javascripts/notes/components/note_form.vue
app/assets/javascripts/notes/components/note_form.vue
+1
-1
ee/app/views/projects/_merge_request_approvals_settings.html.haml
...iews/projects/_merge_request_approvals_settings.html.haml
+1
-1
No files found.
app/assets/javascripts/batch_comments/components/drafts_count.vue
View file @
1bf772da
...
@@ -12,7 +12,7 @@ export default {
...
@@ -12,7 +12,7 @@ export default {
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<gl-badge
size=
"sm"
variant=
"
success
"
>
<gl-badge
size=
"sm"
variant=
"
info"
class=
"gl-ml-2
"
>
{{
draftsCount
}}
{{
draftsCount
}}
<span
class=
"sr-only"
>
{{
n__
(
'
draft
'
,
'
drafts
'
,
draftsCount
)
}}
</span>
<span
class=
"sr-only"
>
{{
n__
(
'
draft
'
,
'
drafts
'
,
draftsCount
)
}}
</span>
</gl-badge>
</gl-badge>
...
...
app/assets/javascripts/batch_comments/components/publish_button.vue
View file @
1bf772da
...
@@ -22,7 +22,7 @@ export default {
...
@@ -22,7 +22,7 @@ export default {
variant
:
{
variant
:
{
type
:
String
,
type
:
String
,
required
:
false
,
required
:
false
,
default
:
'
success
'
,
default
:
'
confirm
'
,
},
},
},
},
computed
:
{
computed
:
{
...
...
app/assets/javascripts/notes/components/note_form.vue
View file @
1bf772da
...
@@ -401,7 +401,7 @@ export default {
...
@@ -401,7 +401,7 @@ export default {
<gl-button
<gl-button
:disabled=
"isDisabled"
:disabled=
"isDisabled"
category=
"secondary"
category=
"secondary"
variant=
"
default
"
variant=
"
confirm
"
data-qa-selector=
"comment_now_button"
data-qa-selector=
"comment_now_button"
class=
"gl-mr-3 js-comment-button"
class=
"gl-mr-3 js-comment-button"
@
click=
"handleUpdate()"
@
click=
"handleUpdate()"
...
...
ee/app/views/projects/_merge_request_approvals_settings.html.haml
View file @
1bf772da
...
@@ -13,4 +13,4 @@
...
@@ -13,4 +13,4 @@
=
form_for
@project
,
html:
{
class:
"merge-request-approval-settings-form js-mr-approvals-form"
},
authenticity_token:
true
do
|
f
|
=
form_for
@project
,
html:
{
class:
"merge-request-approval-settings-form js-mr-approvals-form"
},
authenticity_token:
true
do
|
f
|
%input
{
name:
'update_section'
,
type:
'hidden'
,
value:
'js-merge-request-approval-settings'
}
%input
{
name:
'update_section'
,
type:
'hidden'
,
value:
'js-merge-request-approval-settings'
}
=
render
'projects/merge_request_approvals_settings_form'
,
form:
f
,
project:
@project
=
render
'projects/merge_request_approvals_settings_form'
,
form:
f
,
project:
@project
=
f
.
submit
_
(
"Save changes"
),
class:
"btn gl-button btn-
success
gl-mt-4"
,
data:
{
qa_selector:
'save_merge_request_approval_settings_button'
}
=
f
.
submit
_
(
"Save changes"
),
class:
"btn gl-button btn-
confirm
gl-mt-4"
,
data:
{
qa_selector:
'save_merge_request_approval_settings_button'
}
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