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
3dcd4a6d
Commit
3dcd4a6d
authored
Aug 13, 2020
by
Evan Read
Committed by
Ezekiel Kigbo
Aug 13, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate merge immediately dialog away from deprecated button
parent
c69eb9b2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
7 deletions
+10
-7
ee/app/assets/javascripts/vue_merge_request_widget/components/merge_immediately_confirmation_dialog.vue
...dget/components/merge_immediately_confirmation_dialog.vue
+5
-7
ee/changelogs/unreleased/eread-migrate-merge-immediately-dialog.yml
...ogs/unreleased/eread-migrate-merge-immediately-dialog.yml
+5
-0
No files found.
ee/app/assets/javascripts/vue_merge_request_widget/components/merge_immediately_confirmation_dialog.vue
View file @
3dcd4a6d
<
script
>
import
{
GlModal
,
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlModal
,
GlButton
}
from
'
@gitlab/ui
'
;
import
{
escape
}
from
'
lodash
'
;
import
{
__
,
sprintf
}
from
'
~/locale
'
;
...
...
@@ -7,7 +7,7 @@ export default {
name
:
'
MergeImmediatelyConfirmationDialog
'
,
components
:
{
GlModal
,
Gl
Deprecated
Button
,
GlButton
,
},
props
:
{
docsUrl
:
{
...
...
@@ -61,14 +61,12 @@ export default {
<p
v-html=
"bodyText"
></p>
<p>
{{
__
(
'
Are you sure you want to merge immediately?
'
)
}}
</p>
<template
#modal-footer
>
<gl-deprecated-button
ref=
"cancelButton"
@
click=
"cancel"
>
{{
__
(
'
Cancel
'
)
}}
</gl-deprecated-button>
<gl-deprecated-button
<gl-button
ref=
"cancelButton"
@
click=
"cancel"
>
{{
__
(
'
Cancel
'
)
}}
</gl-button>
<gl-button
variant=
"danger"
data-qa-selector=
"merge_immediately_button"
@
click=
"mergeImmediately"
>
{{
__
(
'
Merge immediately
'
)
}}
</gl-
deprecated-
button
>
{{
__
(
'
Merge immediately
'
)
}}
</gl-button
>
</
template
>
</gl-modal>
...
...
ee/changelogs/unreleased/eread-migrate-merge-immediately-dialog.yml
0 → 100644
View file @
3dcd4a6d
---
title
:
Migrate merge immediately dialog away from deprecated button
merge_request
:
39284
author
:
type
:
other
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