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
0b911b39
Commit
0b911b39
authored
Jan 15, 2019
by
Constance Okoghenun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added tooltips to issues related merge request status icons
The tooltips contain the status label and date
parent
25a12351
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
3 deletions
+17
-3
app/views/projects/issues/_merge_requests_status.html.haml
app/views/projects/issues/_merge_requests_status.html.haml
+17
-3
No files found.
app/views/projects/issues/_merge_requests_status.html.haml
View file @
0b911b39
-
if
merge_request
.
merged?
-
if
merge_request
.
merged?
=
sprite_icon
(
'merge'
,
size:
16
,
css_class:
"merge-request-status merged
#{
css_class
}
"
)
-
mr_status_date
=
merge_request
.
merged_at
-
mr_status_title
=
'Merged'
-
mr_status_icon
=
'merge'
-
mr_status_class
=
'merged'
-
elsif
merge_request
.
closed?
-
elsif
merge_request
.
closed?
=
sprite_icon
(
'issue-close'
,
size:
16
,
css_class:
"merge-request-status closed
#{
css_class
}
"
)
-
mr_status_date
=
merge_request
.
closed_event
&
.
created_at
-
mr_status_title
=
'Closed'
-
mr_status_icon
=
'issue-close'
-
mr_status_class
=
'closed'
-
else
-
else
=
sprite_icon
(
'issue-open-m'
,
size:
16
,
css_class:
"merge-request-status open
#{
css_class
}
"
)
-
mr_status_date
=
merge_request
.
created_at
-
mr_status_title
=
'Opened'
-
mr_status_icon
=
'issue-open-m'
-
mr_status_class
=
'open'
-
mr_status_tooltip
=
"<div class=
\"
bold mb-1
\"
>
#{
mr_status_title
}
</div><span class=
\"
text-tertiary
\"
>
#{
l
(
mr_status_date
.
to_time
,
format: :timeago_tooltip
)
}
</span>"
%span
.suggestion-help-hover
{
class:
css_class
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
html:
'true'
,
title:
mr_status_tooltip
}
}
=
sprite_icon
(
mr_status_icon
,
size:
16
,
css_class:
"merge-request-status
#{
mr_status_class
}
"
)
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