Add latest changes from gitlab-org/gitlab@master

5 files changed, 34 insertions, 18 deletions

diff --git a/app/assets/javascripts/merge_requests/components/sticky_header.vue b/app/assets/javascripts/merge_requests/components/sticky_header.vue
index 877e6142bae..e405a534cdc 100644
--- a/app/assets/javascripts/merge_requests/components/sticky_header.vue
+++ b/app/assets/javascripts/merge_requests/components/sticky_header.vue
@@ -70,6 +70,7 @@ export default {
     title: { default: '' },
     tabs: { default: () => [] },
     isFluidLayout: { default: false },
+    blocksMerge: { default: false },
   },
   data() {
     return {
@@ -226,7 +227,7 @@ export default {
             </li>
           </ul>
           <div class="gl-display-none gl-lg-display-flex gl-align-items-center gl-ml-auto">
-            <discussion-counter blocks-merge hide-options />
+            <discussion-counter :blocks-merge="blocksMerge" hide-options />
             <div
               v-if="isSignedIn"
               :class="{ 'gl-display-flex gl-gap-3': isNotificationsTodosButtons }"
diff --git a/app/assets/javascripts/pages/projects/merge_requests/page.js b/app/assets/javascripts/pages/projects/merge_requests/page.js
index a9d281fc899..69032455fe3 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/page.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/page.js
@@ -28,7 +28,15 @@ requestIdleCallback(() => {
 
   if (el) {
     const { data } = el.dataset;
-    const { iid, projectPath, title, tabs, isFluidLayout, sourceProjectPath } = JSON.parse(data);
+    const {
+      iid,
+      projectPath,
+      title,
+      tabs,
+      isFluidLayout,
+      sourceProjectPath,
+      blocksMerge,
+    } = JSON.parse(data);
 
     // eslint-disable-next-line no-new
     new Vue({
@@ -42,6 +50,7 @@ requestIdleCallback(() => {
         title,
         tabs,
         isFluidLayout: parseBoolean(isFluidLayout),
+        blocksMerge: parseBoolean(blocksMerge),
         sourceProjectPath,
       },
       render(h) {
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 522fb134002..75a41054ace 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -293,6 +293,7 @@ module MergeRequestsHelper
       sourceProjectPath: @merge_request.source_project_path,
       title: markdown_field(@merge_request, :title),
       isFluidLayout: fluid_layout.to_s,
+      blocksMerge: @project.only_allow_merge_if_all_discussions_are_resolved?.to_s,
       tabs: [
         ['show', _('Overview'), project_merge_request_path(@project, @merge_request), @merge_request.related_notes.user.count],
         ['commits', _('Commits'), commits_project_merge_request_path(@project, @merge_request), @commits_count],
diff --git a/lib/gitlab/i18n.rb b/lib/gitlab/i18n.rb
index 02afdedb4be..d2f916fb02a 100644
--- a/lib/gitlab/i18n.rb
+++ b/lib/gitlab/i18n.rb
@@ -44,30 +44,30 @@ module Gitlab
     TRANSLATION_LEVELS = {
       'bg' => 0,
       'cs_CZ' => 0,
-      'da_DK' => 28,
-      'de' => 95,
+      'da_DK' => 27,
+      'de' => 93,
       'en' => 100,
       'eo' => 0,
-      'es' => 28,
+      'es' => 27,
       'fil_PH' => 0,
-      'fr' => 99,
+      'fr' => 97,
       'gl_ES' => 0,
       'id_ID' => 0,
       'it' => 1,
-      'ja' => 98,
-      'ko' => 23,
+      'ja' => 94,
+      'ko' => 22,
       'nb_NO' => 20,
       'nl_NL' => 0,
-      'pl_PL' => 3,
-      'pt_BR' => 60,
-      'ro_RO' => 74,
-      'ru' => 21,
+      'pl_PL' => 2,
+      'pt_BR' => 59,
+      'ro_RO' => 72,
+      'ru' => 20,
       'si_LK' => 11,
       'tr_TR' => 8,
       'uk' => 51,
-      'zh_CN' => 99,
+      'zh_CN' => 97,
       'zh_HK' => 1,
-      'zh_TW' => 99
+      'zh_TW' => 97
     }.freeze
     private_constant :TRANSLATION_LEVELS
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index e564ad8d7ce..d39d8a205a1 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -51616,13 +51616,18 @@ msgstr ""
 msgid "Tracing"
 msgstr ""
 
-msgid "Tracing|%{count} match"
-msgid_plural "Tracing|%{count} matches"
+msgid "Tracing|%d error"
+msgid_plural "Tracing|%d errors"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "Tracing|%{count} span"
-msgid_plural "Tracing|%{count} spans"
+msgid "Tracing|%d match"
+msgid_plural "Tracing|%d matches"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Tracing|%d span"
+msgid_plural "Tracing|%d spans"
 msgstr[0] ""
 msgstr[1] ""