Add latest changes from gitlab-org/gitlab@master

4 files changed, 29 insertions, 18 deletions

diff --git a/app/assets/javascripts/ci/runner/components/runner_platforms_radio.vue b/app/assets/javascripts/ci/runner/components/runner_platforms_radio.vue
index d70c51e83f9..f780f623136 100644
--- a/app/assets/javascripts/ci/runner/components/runner_platforms_radio.vue
+++ b/app/assets/javascripts/ci/runner/components/runner_platforms_radio.vue
@@ -47,13 +47,12 @@ export default {
 
 <template>
   <div
-    class="runner-platforms-radio gl-display-flex gl-border gl-rounded-base gl-px-5 gl-py-6"
+    class="runner-platforms-radio gl-border gl-rounded-base gl-px-5 gl-pt-6 gl-pb-5"
     :class="{ 'gl-bg-blue-50 gl-border-blue-500': isChecked, 'gl-cursor-pointer': value }"
     @click="onInput(value)"
   >
     <gl-form-radio
       v-if="value"
-      class="gl-min-h-5"
       :checked="checked"
       :value="value"
       @input="onInput($event)"
@@ -62,7 +61,7 @@ export default {
       <img v-if="image" :src="image" aria-hidden="true" class="gl-h-5 gl-mr-2" />
       <span class="gl-font-weight-bold"><slot></slot></span>
     </gl-form-radio>
-    <div v-else class="gl-h-5">
+    <div v-else class="gl-mb-3">
       <img v-if="image" :src="image" aria-hidden="true" class="gl-h-5 gl-mr-2" />
       <span class="gl-font-weight-bold"><slot></slot></span>
     </div>
diff --git a/app/assets/javascripts/lib/mermaid.js b/app/assets/javascripts/lib/mermaid.js
index 60b46989375..bbc1d8ae1e1 100644
--- a/app/assets/javascripts/lib/mermaid.js
+++ b/app/assets/javascripts/lib/mermaid.js
@@ -6,7 +6,7 @@ const setIframeRenderedSize = (h, w) => {
   window.parent.postMessage({ h, w }, origin);
 };
 
-const drawDiagram = (source) => {
+const drawDiagram = async (source) => {
   const element = document.getElementById('app');
   const insertSvg = (svgCode) => {
     // eslint-disable-next-line no-unsanitized/property
@@ -17,7 +17,9 @@ const drawDiagram = (source) => {
 
     setIframeRenderedSize(height, width);
   };
-  mermaid.mermaidAPI.render('mermaid', source, insertSvg);
+
+  const { svg } = await mermaid.mermaidAPI.render('mermaid', source);
+  insertSvg(svg);
 };
 
 const darkModeEnabled = () => getParameterByName('darkMode') === 'true';
diff --git a/app/assets/javascripts/projects/settings/access_dropdown.js b/app/assets/javascripts/projects/settings/access_dropdown.js
index 71c9e580420..d8675a851ea 100644
--- a/app/assets/javascripts/projects/settings/access_dropdown.js
+++ b/app/assets/javascripts/projects/settings/access_dropdown.js
@@ -408,14 +408,16 @@ export default class AccessDropdown {
 
       // Has to be checked against server response
       // because the selected item can be in filter results
-      usersResponse.forEach((response) => {
-        // Add is it has not been added
-        if (map.indexOf(LEVEL_TYPES.USER + response.id) === -1) {
-          const user = { ...response };
-          user.type = LEVEL_TYPES.USER;
-          users.push(user);
-        }
-      });
+      if (gon.current_project_id) {
+        usersResponse.forEach((response) => {
+          // Add is it has not been added
+          if (map.indexOf(LEVEL_TYPES.USER + response.id) === -1) {
+            const user = { ...response };
+            user.type = LEVEL_TYPES.USER;
+            users.push(user);
+          }
+        });
+      }
 
       if (groups.length) {
         if (roles.length) {
diff --git a/app/assets/javascripts/releases/components/release_block_assets.vue b/app/assets/javascripts/releases/components/release_block_assets.vue
index cc28980a6bf..dd45a2b1762 100644
--- a/app/assets/javascripts/releases/components/release_block_assets.vue
+++ b/app/assets/javascripts/releases/components/release_block_assets.vue
@@ -83,8 +83,17 @@ export default {
     linksForType(type) {
       return this.assets.links.filter((l) => l.linkType === type);
     },
+    getTooltipTitle(section) {
+      return section.title
+        ? this.$options.externalLinkTooltipText
+        : this.$options.downloadTooltipText;
+    },
+    getIconName(section) {
+      return section.title ? 'external-link' : 'download';
+    },
   },
   externalLinkTooltipText: __('This link points to external content'),
+  downloadTooltipText: __('Download'),
 };
 </script>
 
@@ -121,13 +130,12 @@ export default {
                 <gl-icon :name="section.iconName" class="gl-mr-2 gl-flex-shrink-0 gl-flex-grow-0" />
                 {{ link.name }}
                 <gl-icon
-                  v-if="section.title"
                   v-gl-tooltip
-                  name="external-link"
-                  :aria-label="$options.externalLinkTooltipText"
-                  :title="$options.externalLinkTooltipText"
+                  :name="getIconName(section)"
+                  :aria-label="getTooltipTitle(section)"
+                  :title="getTooltipTitle(section)"
                   data-testid="external-link-indicator"
-                  class="gl-ml-2 gl-flex-shrink-0 gl-flex-grow-0 gl-text-gray-400"
+                  class="gl-ml-2 gl-flex-shrink-0 gl-flex-grow-0"
                 />
               </gl-link>
             </li>