diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 09:08:31 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 09:08:31 +0000 |
commit | a76d34e6716aa8267111ecdcd21416e9dec3a08d (patch) | |
tree | 25876a46afec0af5b0d7168addb45e743d2a2128 /app | |
parent | 00bd11b166a886742f04d38c0d2551e52ff51472 (diff) | |
download | gitlab-ce-a76d34e6716aa8267111ecdcd21416e9dec3a08d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/shared/popover.js | 4 | ||||
-rw-r--r-- | app/views/clusters/clusters/_namespace.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/shared/popover.js b/app/assets/javascripts/shared/popover.js index 3fc03553bdd..435ee8fb968 100644 --- a/app/assets/javascripts/shared/popover.js +++ b/app/assets/javascripts/shared/popover.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import _ from 'underscore'; +import { debounce } from 'lodash'; export function togglePopover(show) { const isAlreadyShown = this.hasClass('js-popover-show'); @@ -29,5 +29,5 @@ export function mouseenter() { } export function debouncedMouseleave(debounceTimeout = 300) { - return _.debounce(mouseleave, debounceTimeout); + return debounce(mouseleave, debounceTimeout); } diff --git a/app/views/clusters/clusters/_namespace.html.haml b/app/views/clusters/clusters/_namespace.html.haml index 8a86fd90963..9b728e7a89b 100644 --- a/app/views/clusters/clusters/_namespace.html.haml +++ b/app/views/clusters/clusters/_namespace.html.haml @@ -1,5 +1,5 @@ - managed_namespace_help_text = s_('ClusterIntegration|Set a prefix for your namespaces. If not set, defaults to your project path. If modified, existing environments will use their current namespaces until the cluster cache is cleared.') -- non_managed_namespace_help_text = s_('ClusterIntegration|The namespace associated with your project. This will be used for deploy boards, pod logs, and Web terminals.') +- non_managed_namespace_help_text = s_('ClusterIntegration|The namespace associated with your project. This will be used for deploy boards, logs, and Web terminals.') - managed_namespace_help_link = link_to _('More information'), help_page_path('user/project/clusters/index.md', anchor: 'gitlab-managed-clusters'), target: '_blank' |