diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-09 18:09:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-09 18:09:21 +0300 |
commit | d2675fa4de909714fcc6dc1bdd7bee9ce5e3af34 (patch) | |
tree | 0c0fbdd55fbb3a1616b10775113bf8320c9529c8 /app/assets/javascripts/projects | |
parent | 48d25238c386a89e8a6af218eeb290936a8f7595 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/projects')
-rw-r--r-- | app/assets/javascripts/projects/commits/components/author_select.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/projects/pipelines/charts/components/app.vue | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/projects/commits/components/author_select.vue b/app/assets/javascripts/projects/commits/components/author_select.vue index c8a0a3417f3..884ef732144 100644 --- a/app/assets/javascripts/projects/commits/components/author_select.vue +++ b/app/assets/javascripts/projects/commits/components/author_select.vue @@ -57,7 +57,7 @@ export default { if (authorParam) { commitsSearchInput.setAttribute('disabled', true); - commitsSearchInput.setAttribute('data-toggle', 'tooltip'); + commitsSearchInput.dataset.toggle = 'tooltip'; commitsSearchInput.setAttribute('title', tooltipMessage); this.currentAuthor = authorParam; } diff --git a/app/assets/javascripts/projects/pipelines/charts/components/app.vue b/app/assets/javascripts/projects/pipelines/charts/components/app.vue index d4b1f7e57d8..0c4ce5dab65 100644 --- a/app/assets/javascripts/projects/pipelines/charts/components/app.vue +++ b/app/assets/javascripts/projects/pipelines/charts/components/app.vue @@ -17,6 +17,7 @@ export default { piplelinesTabEvent: 'p_analytics_ci_cd_pipelines', deploymentFrequencyTabEvent: 'p_analytics_ci_cd_deployment_frequency', leadTimeTabEvent: 'p_analytics_ci_cd_lead_time', + timeToRestoreServiceTabEvent: 'p_analytics_ci_cd_time_to_restore_service', inject: { shouldRenderDoraCharts: { type: Boolean, @@ -37,7 +38,7 @@ export default { const chartsToShow = ['pipelines']; if (this.shouldRenderDoraCharts) { - chartsToShow.push('deployment-frequency', 'lead-time'); + chartsToShow.push('deployment-frequency', 'lead-time', 'time-to-restore-service'); } if (this.shouldRenderQualitySummary) { |