diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-17 00:09:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-17 00:09:02 +0300 |
| commit | b9033ad4157010ccd8f37437de131ed70af90f45 (patch) | |
| tree | 7d10ebd824040aabc585273e07dec6ebde64730f /app/assets/javascripts/pages | |
| parent | 6d9c4dc2ef4c63bee8e9ca095dc2f0ed683a34f5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pages')
| -rw-r--r-- | app/assets/javascripts/pages/groups/dependency_proxies/index.js | 20 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue | 4 |
2 files changed, 10 insertions, 14 deletions
diff --git a/app/assets/javascripts/pages/groups/dependency_proxies/index.js b/app/assets/javascripts/pages/groups/dependency_proxies/index.js index 4c0a1abb0f0..77c885d3858 100644 --- a/app/assets/javascripts/pages/groups/dependency_proxies/index.js +++ b/app/assets/javascripts/pages/groups/dependency_proxies/index.js @@ -1,17 +1,13 @@ import $ from 'jquery'; import initDependencyProxy from '~/dependency_proxy'; -document.addEventListener('DOMContentLoaded', () => { - initDependencyProxy(); -}); +initDependencyProxy(); -document.addEventListener('DOMContentLoaded', () => { - const form = document.querySelector('form.edit_dependency_proxy_group_setting'); - const toggleInput = $('input.js-project-feature-toggle-input'); +const form = document.querySelector('form.edit_dependency_proxy_group_setting'); +const toggleInput = $('input.js-project-feature-toggle-input'); - if (form && toggleInput) { - toggleInput.on('trigger-change', () => { - form.submit(); - }); - } -}); +if (form && toggleInput) { + toggleInput.on('trigger-change', () => { + form.submit(); + }); +} diff --git a/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue b/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue index a9079f91f50..6dd50958fa4 100644 --- a/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue +++ b/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue @@ -153,10 +153,10 @@ export default { :option="chartOptions" :format-tooltip-text="formatTooltipText" > - <template v-if="canShowData" #tooltipTitle> + <template v-if="canShowData" #tooltip-title> {{ tooltipTitle }} </template> - <template v-if="canShowData" #tooltipContent> + <template v-if="canShowData" #tooltip-content> <gl-sprintf :message="__('Code Coverage: %{coveragePercentage}%{percentSymbol}')"> <template #coveragePercentage> {{ coveragePercentage }} |