diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-13 15:08:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-13 15:08:49 +0300 |
commit | 988424215cf104d9ee24bb1751141424cffb32d1 (patch) | |
tree | 9d2525571ecc693902b949ac8441e8c97b299c3c /app/assets/javascripts/pipelines | |
parent | 2705a15deaef07b1a38a53b9539d02f8ad499ce3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipelines')
-rw-r--r-- | app/assets/javascripts/pipelines/pipeline_tabs.js | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/javascripts/pipelines/pipeline_tabs.js b/app/assets/javascripts/pipelines/pipeline_tabs.js index a56ac9d86ab..530917f0402 100644 --- a/app/assets/javascripts/pipelines/pipeline_tabs.js +++ b/app/assets/javascripts/pipelines/pipeline_tabs.js @@ -3,6 +3,7 @@ import VueApollo from 'vue-apollo'; import PipelineTabs from 'ee_else_ce/pipelines/components/pipeline_tabs.vue'; import { removeParams, updateHistory } from '~/lib/utils/url_utility'; import { TAB_QUERY_PARAM } from '~/pipelines/constants'; +import { parseBoolean } from '~/lib/utils/common_utils'; import { getPipelineDefaultTab, reportToSentry } from './utils'; Vue.use(VueApollo); @@ -19,6 +20,9 @@ const createPipelineTabs = (selector, apolloProvider) => { downloadablePathForReportType, exposeSecurityDashboard, exposeLicenseScanningData, + graphqlResourceEtag, + pipelineIid, + pipelineProjectPath, } = dataset; const defaultTabValue = getPipelineDefaultTab(window.location.href); @@ -37,12 +41,15 @@ const createPipelineTabs = (selector, apolloProvider) => { }, apolloProvider, provide: { - canGenerateCodequalityReports: JSON.parse(canGenerateCodequalityReports), + canGenerateCodequalityReports: parseBoolean(canGenerateCodequalityReports), codequalityReportDownloadPath, defaultTabValue, downloadablePathForReportType, - exposeSecurityDashboard: JSON.parse(exposeSecurityDashboard), - exposeLicenseScanningData: JSON.parse(exposeLicenseScanningData), + exposeSecurityDashboard: parseBoolean(exposeSecurityDashboard), + exposeLicenseScanningData: parseBoolean(exposeLicenseScanningData), + graphqlResourceEtag, + pipelineIid, + pipelineProjectPath, }, errorCaptured(err, _vm, info) { reportToSentry('pipeline_tabs', `error: ${err}, info: ${info}`); |