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
18df379a
Commit
18df379a
authored
Oct 12, 2020
by
Pedro Moreira da Silva
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate revert and cherry-pick MR tooltips
Migrate tooltips of those two buttons to GitLab UI
parent
be95dbcb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue
...rge_request_widget/components/states/mr_widget_merged.vue
+6
-7
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue
View file @
18df379a
<
script
>
/* eslint-disable @gitlab/vue-require-i18n-strings */
import
{
GlLoadingIcon
,
GlButton
}
from
'
@gitlab/ui
'
;
import
{
GlLoadingIcon
,
GlButton
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
deprecatedCreateFlash
as
Flash
}
from
'
~/flash
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
{
s__
,
__
}
from
'
~/locale
'
;
import
ClipboardButton
from
'
~/vue_shared/components/clipboard_button.vue
'
;
import
MrWidgetAuthorTime
from
'
../mr_widget_author_time.vue
'
;
...
...
@@ -12,7 +11,7 @@ import eventHub from '../../event_hub';
export
default
{
name
:
'
MRWidgetMerged
'
,
directives
:
{
tooltip
,
GlTooltip
:
GlTooltipDirective
,
},
components
:
{
MrWidgetAuthorTime
,
...
...
@@ -115,7 +114,7 @@ export default {
/>
<gl-button
v-if=
"mr.canRevertInCurrentMR"
v-
tooltip
v-
gl-tooltip
.
hover
:title=
"revertTitle"
size=
"small"
category=
"secondary"
...
...
@@ -128,7 +127,7 @@ export default {
</gl-button>
<gl-button
v-else-if=
"mr.revertInForkPath"
v-
tooltip
v-
gl-tooltip
.
hover
:href=
"mr.revertInForkPath"
:title=
"revertTitle"
size=
"small"
...
...
@@ -140,7 +139,7 @@ export default {
</gl-button>
<gl-button
v-if=
"mr.canCherryPickInCurrentMR"
v-
tooltip
v-
gl-tooltip
.
hover
:title=
"cherryPickTitle"
size=
"small"
href=
"#modal-cherry-pick-commit"
...
...
@@ -151,7 +150,7 @@ export default {
</gl-button>
<gl-button
v-else-if=
"mr.cherryPickInForkPath"
v-
tooltip
v-
gl-tooltip
.
hover
:href=
"mr.cherryPickInForkPath"
:title=
"cherryPickTitle"
size=
"small"
...
...
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