Commit 2cd55cd4 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'ph/fixWidgetTranslationString' into 'master'

Fixed un-translated string in merge request widget

See merge request gitlab-org/gitlab!73774
parents b47daf73 a6778fb8
...@@ -67,8 +67,8 @@ export default { ...@@ -67,8 +67,8 @@ export default {
<template #targetBranch> <template #targetBranch>
<span class="label-branch">{{ targetBranchEscaped }}</span> <span class="label-branch">{{ targetBranchEscaped }}</span>
</template> </template>
<template v-if="glFeatures.restructuredMrWidget" #squashedCommits> <template #squashedCommits>
<template v-if="isSquashEnabled"> <template v-if="glFeatures.restructuredMrWidget && isSquashEnabled">
{{ __('(commits will be squashed)') }}</template {{ __('(commits will be squashed)') }}</template
></template ></template
> >
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment