Skip to content

G
gitlab-ce
Commit a6778fb8 authored by Phil Hughes's avatar Phil Hughes
Browse files
Options

Fixed un-translated string in merge request widget

parent 3b744058
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
app/assets/javascripts/vue_merge_request_widget/components/added_commit_message.vue
View file @ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7