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
52efc366
Commit
52efc366
authored
Aug 20, 2020
by
Kevin Comoli
Committed by
Enrique Alcántara
Aug 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert gl-deprecated-button to gl-button in ready_to_merge.vue
parent
654470c5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
...merge_request_widget/components/states/ready_to_merge.vue
+6
-6
spec/frontend/add_context_commits_modal/components/__snapshots__/add_context_commits_modal_spec.js.snap
...ents/__snapshots__/add_context_commits_modal_spec.js.snap
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
View file @
52efc366
<
script
>
import
{
isEmpty
}
from
'
lodash
'
;
import
{
GlIcon
,
Gl
Deprecated
Button
,
GlSprintf
,
GlLink
}
from
'
@gitlab/ui
'
;
import
{
GlIcon
,
GlButton
,
GlSprintf
,
GlLink
}
from
'
@gitlab/ui
'
;
import
successSvg
from
'
icons/_icon_status_success.svg
'
;
import
warningSvg
from
'
icons/_icon_status_warning.svg
'
;
import
readyToMergeMixin
from
'
ee_else_ce/vue_merge_request_widget/mixins/ready_to_merge
'
;
...
...
@@ -37,7 +37,7 @@ export default {
GlIcon
,
GlSprintf
,
GlLink
,
Gl
Deprecated
Button
,
GlButton
,
MergeTrainHelperText
:
()
=>
import
(
'
ee_component/vue_merge_request_widget/components/merge_train_helper_text.vue
'
),
MergeImmediatelyConfirmationDialog
:
()
=>
...
...
@@ -297,16 +297,16 @@ export default {
<div
class=
"media-body"
>
<div
class=
"mr-widget-body-controls media space-children"
>
<span
class=
"btn-group"
>
<gl-deprecated-button
size=
"sm"
<gl-button
size=
"medium"
category=
"primary"
class=
"qa-merge-button accept-merge-request"
:variant=
"mergeButtonVariant"
:disabled=
"isMergeButtonDisabled"
:loading=
"isMakingRequest"
@
click=
"handleMergeButtonClick(isAutoMergeAvailable)"
>
{{
mergeButtonText
}}
</gl-button
>
{{
mergeButtonText
}}
</gl-deprecated-button>
<button
v-if=
"shouldShowMergeImmediatelyDropdown"
:disabled=
"isMergeButtonDisabled"
...
...
spec/frontend/add_context_commits_modal/components/__snapshots__/add_context_commits_modal_spec.js.snap
View file @
52efc366
...
...
@@ -47,4 +47,4 @@ exports[`AddContextCommitsModal renders modal with 2 tabs 1`] = `
</gl-tab-stub>
</gl-tabs-stub>
</gl-modal-stub>
`;
`;
\ No newline at end of file
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