Fixed un-translated string in merge request widget

a6778fb8 · Phil Hughes · 3b744058 · a6778fb8
Commit a6778fb8 authored Nov 04, 2021 by Phil Hughes
Hide 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 ..._merge_request_widget/components/added_commit_message.vue +2 -2

No files found.
--- a/app/assets/javascripts/vue_merge_request_widget/components/added_commit_message.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/added_commit_message.vue
@@ -67,8 +67,8 @@ export default {
      <template #targetBranch>
        <span class="label-branch">{{ targetBranchEscaped }}</span>
      </template>
-      <template v-if="glFeatures.restructuredMrWidget" #squashedCommits>
+      <template #squashedCommits>
-        <template v-if="isSquashEnabled">
+        <template v-if="glFeatures.restructuredMrWidget && isSquashEnabled">
          {{ __('(commits will be squashed)') }}</template
        ></template
      >