diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-15 15:08:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-15 15:08:30 +0000 |
| commit | ce97c898865e06644ae9c04d5c3666775b9998cb (patch) | |
| tree | 03e9e241b7d713a9fd137be4be841e38297e7acd /app/assets/javascripts/diffs/components/diff_row.vue | |
| parent | b50c9d31e395afcab172d16760c5700c8cd5bcae (diff) | |
| download | gitlab-ce-ce97c898865e06644ae9c04d5c3666775b9998cb.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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_row.vue b/app/assets/javascripts/diffs/components/diff_row.vue index dfca6d61270..1f5c9b4f2f5 100644 --- a/app/assets/javascripts/diffs/components/diff_row.vue +++ b/app/assets/javascripts/diffs/components/diff_row.vue @@ -6,6 +6,7 @@ https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57842 * */ import { memoize } from 'lodash'; import { isLoggedIn } from '~/lib/utils/common_utils'; +import { compatFunctionalMixin } from '~/lib/utils/vue3compat/compat_functional_mixin'; import { PARALLEL_DIFF_VIEW_TYPE, CONFLICT_MARKER_THEIR, @@ -24,6 +25,10 @@ import * as utils from './diff_row_utils'; export default { DiffGutterAvatars, CodeQualityGutterIcon: () => import('ee_component/diffs/components/code_quality_gutter_icon.vue'), + + // Temporary mixin for migration from Vue.js 2 to @vue/compat + mixins: [compatFunctionalMixin], + props: { fileHash: { type: String, |