Add latest changes from gitlab-org/gitlab@master

4 files changed, 18 insertions, 7 deletions

diff --git a/app/assets/javascripts/lib/utils/axios_startup_calls.js b/app/assets/javascripts/lib/utils/axios_startup_calls.js
index a86c8efca1f..cb2e8a76c08 100644
--- a/app/assets/javascripts/lib/utils/axios_startup_calls.js
+++ b/app/assets/javascripts/lib/utils/axios_startup_calls.js
@@ -27,17 +27,22 @@ const setupAxiosStartupCalls = axios => {
     if (existing) {
       // eslint-disable-next-line no-param-reassign
       req.adapter = () =>
-        existing.fetchCall.then(res =>
+        existing.fetchCall.then(res => {
+          const fetchHeaders = {};
+          res.headers.forEach((val, key) => {
+            fetchHeaders[key] = val;
+          });
+
           // eslint-disable-next-line promise/no-nesting
-          res.json().then(data => ({
+          return res.json().then(data => ({
             data,
             status: res.status,
             statusText: res.statusText,
-            headers: res.headers,
+            headers: fetchHeaders,
             config: req,
             request: req,
-          })),
-        );
+          }));
+        });
     }
 
     return req;
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 132b3ac26c7..b742fe42024 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -19,6 +19,7 @@ import { getLocationHash, visitUrl } from './lib/utils/url_utility';
 
 // everything else
 import loadAwardsHandler from './awards_handler';
+import applyGitLabUIConfig from '@gitlab/ui/dist/config';
 import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
 import Flash, { removeFlashClickListener } from './flash';
 import './gl_dropdown';
@@ -42,6 +43,8 @@ import { __ } from './locale';
 
 import 'ee_else_ce/main_ee';
 
+applyGitLabUIConfig();
+
 // expose jQuery as global (TODO: remove these)
 window.jQuery = jQuery;
 window.$ = jQuery;
diff --git a/app/assets/javascripts/monitoring/components/dashboard_header.vue b/app/assets/javascripts/monitoring/components/dashboard_header.vue
index 16a21ae0d3c..4e9f00c6d6e 100644
--- a/app/assets/javascripts/monitoring/components/dashboard_header.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard_header.vue
@@ -353,7 +353,10 @@ export default {
         </gl-deprecated-button>
       </div>
 
-      <div v-if="externalDashboardUrl.length" class="mb-2 mr-2 d-flex d-sm-block">
+      <div
+        v-if="externalDashboardUrl && externalDashboardUrl.length"
+        class="mb-2 mr-2 d-flex d-sm-block"
+      >
         <gl-deprecated-button
           class="flex-grow-1 js-external-dashboard-link"
           variant="primary"
diff --git a/app/assets/javascripts/repository/graphql.js b/app/assets/javascripts/repository/graphql.js
index 6640b636597..450a1571165 100644
--- a/app/assets/javascripts/repository/graphql.js
+++ b/app/assets/javascripts/repository/graphql.js
@@ -30,7 +30,7 @@ const defaultClient = createDefaultClient(
       },
       readme(_, { url }) {
         return axios
-          .get(url, { params: { viewer: 'rich', format: 'json' } })
+          .get(url, { params: { format: 'json', viewer: 'rich' } })
           .then(({ data }) => ({ ...data, __typename: 'ReadmeFile' }));
       },
     },