diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-31 10:38:23 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-31 10:38:23 +0000 |
| commit | cc7811707424ebd58b71428c9fe27c444dd6169d (patch) | |
| tree | d11f3c7501cdcc0517501e7ad17f272d219e794c | |
| parent | aacc611090c0ae1bdb703e675e9e3283d8609f70 (diff) | |
| parent | 35cd92a69cf74f137031f3e35d25785dcca67d68 (diff) | |
| download | gitlab-ce-cc7811707424ebd58b71428c9fe27c444dd6169d.tar.gz | |
Merge branch '36917-branch-tooltip' into 'master'
Adds a tooltip to the branch name
Closes #36917
See merge request !13925
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/commit.vue | 20 | ||||
| -rw-r--r-- | changelogs/unreleased/36917-branch-tooltip.yml | 5 |
2 files changed, 20 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_shared/components/commit.vue b/app/assets/javascripts/vue_shared/components/commit.vue index 262584769e0..50d14282cad 100644 --- a/app/assets/javascripts/vue_shared/components/commit.vue +++ b/app/assets/javascripts/vue_shared/components/commit.vue @@ -1,6 +1,7 @@ <script> import commitIconSvg from 'icons/_icon_commit.svg'; import userAvatarLink from './user_avatar/user_avatar_link.vue'; + import tooltip from '../directives/tooltip'; export default { props: { @@ -100,17 +101,22 @@ this.author.username ? `${this.author.username}'s avatar` : null; }, }, - data() { - return { commitIconSvg }; + directives: { + tooltip, }, components: { userAvatarLink, }, + created() { + this.commitIconSvg = commitIconSvg; + }, }; </script> <template> <div class="branch-commit"> - <div v-if="hasCommitRef" class="icon-container hidden-xs"> + <div + v-if="hasCommitRef" + class="icon-container hidden-xs"> <i v-if="tag" class="fa fa-tag" @@ -126,7 +132,10 @@ <a v-if="hasCommitRef" class="ref-name hidden-xs" - :href="commitRef.ref_url"> + :href="commitRef.ref_url" + v-tooltip + data-container="body" + :title="commitRef.name"> {{commitRef.name}} </a> @@ -153,7 +162,8 @@ :img-alt="userImageAltDescription" :tooltip-text="author.username" /> - <a class="commit-row-message" + <a + class="commit-row-message" :href="commitUrl"> {{title}} </a> diff --git a/changelogs/unreleased/36917-branch-tooltip.yml b/changelogs/unreleased/36917-branch-tooltip.yml new file mode 100644 index 00000000000..2d37de50cec --- /dev/null +++ b/changelogs/unreleased/36917-branch-tooltip.yml @@ -0,0 +1,5 @@ +--- +title: Adds tooltip to the branch name and improves performance +merge_request: +author: +type: fixed |