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
756b2dc6
Commit
756b2dc6
authored
Aug 06, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
6a20a6f4
f64a84b2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
13 deletions
+16
-13
app/assets/javascripts/vue_shared/components/commit.vue
app/assets/javascripts/vue_shared/components/commit.vue
+10
-12
app/assets/stylesheets/framework/responsive_tables.scss
app/assets/stylesheets/framework/responsive_tables.scss
+1
-1
changelogs/unreleased/64608-double-tooltips.yml
changelogs/unreleased/64608-double-tooltips.yml
+5
-0
No files found.
app/assets/javascripts/vue_shared/components/commit.vue
View file @
756b2dc6
...
...
@@ -152,37 +152,35 @@ export default {
:href=
"mergeRequestRef.path"
:title=
"mergeRequestRef.title"
class=
"ref-name"
>
{{
mergeRequestRef
.
iid
}}
</gl-link
>
{{
mergeRequestRef
.
iid
}}
</gl-link>
<gl-link
v-else
v-gl-tooltip
:href=
"commitRef.ref_url"
:title=
"commitRef.name"
class=
"ref-name"
>
{{
commitRef
.
name
}}
</gl-link
>
{{
commitRef
.
name
}}
</gl-link>
</
template
>
<icon
name=
"commit"
class=
"commit-icon js-commit-icon"
/>
<gl-link
:href=
"commitUrl"
class=
"commit-sha mr-0"
>
{{ shortSha }}
</gl-link>
<gl-link
:href=
"commitUrl"
class=
"commit-sha mr-0"
>
{{ shortSha }}
</gl-link>
<div
class=
"commit-title
flex-truncate-parent
"
>
<
tooltip-on-truncate
v-if=
"title"
class=
"flex-truncate-child"
:title=
"title
"
>
<div
class=
"commit-title"
>
<
span
v-if=
"title"
class=
"flex-truncate-parent
"
>
<user-avatar-link
v-if=
"hasAuthor"
:link-href=
"author.path"
:img-src=
"author.avatar_url"
:img-alt=
"userImageAltDescription"
:tooltip-text=
"author.username"
class=
"avatar-image-container"
class=
"avatar-image-container
text-decoration-none
"
/>
<
gl-link
:href=
"commitUrl"
class=
"commit-row-message cgray
"
>
{{ title }}
</
gl-link
>
</
tooltip-on-truncate
>
<
tooltip-on-truncate
:title=
"title"
class=
"flex-truncate-child
"
>
<gl-link
:href=
"commitUrl"
class=
"commit-row-message cgray"
>
{{ title }}
</gl-link>
</
tooltip-on-truncate
>
</
span
>
<span
v-else
>
{{ __("Can't find HEAD commit for this branch") }}
</span>
</div>
</div>
...
...
app/assets/stylesheets/framework/responsive_tables.scss
View file @
756b2dc6
...
...
@@ -155,7 +155,7 @@
text-overflow
:
ellipsis
;
@include
media-breakpoint-up
(
md
)
{
flex
:
0
0
90
%
;
flex
:
0
0
85
%
;
}
.avatar
{
...
...
changelogs/unreleased/64608-double-tooltips.yml
0 → 100644
View file @
756b2dc6
---
title
:
Prevents showing 2 tooltips in pipelines table
merge_request
:
author
:
type
:
fixed
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