diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-03 00:09:41 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-03 00:09:41 +0000 |
| commit | a020b8c048bf621f5193c38833bbdea4c0e080af (patch) | |
| tree | 41003e2fd63ddc6cdc935294284cdad1b2072150 /app/assets/javascripts/diffs/components/diff_row.vue | |
| parent | 36e4abb3dd21deb8b8938ddaccec3bb59d6cbb7e (diff) | |
| download | gitlab-ce-a020b8c048bf621f5193c38833bbdea4c0e080af.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/diffs/components/diff_row.vue')
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_row.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_row.vue b/app/assets/javascripts/diffs/components/diff_row.vue index 219d742f8b3..26a175cea51 100644 --- a/app/assets/javascripts/diffs/components/diff_row.vue +++ b/app/assets/javascripts/diffs/components/diff_row.vue @@ -11,6 +11,7 @@ import { CONFLICT_THEIR, CONFLICT_MARKER, } from '../constants'; +import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; import DiffGutterAvatars from './diff_gutter_avatars.vue'; import * as utils from './diff_row_utils'; @@ -162,7 +163,7 @@ export default { this.$emit('enterdragging', { ...line, index }); }, onDragStart(line) { - this.$root.$emit('bv::hide::tooltip'); + this.$root.$emit(BV_HIDE_TOOLTIP); this.dragging = true; this.$emit('startdragging', line); }, |