Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-14 21:09:48 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-14 21:09:48 +0300
commita8caa9ce4922947ba057f259bccd017c2177e1b5 (patch)
treec2d3e86b3c0336630edc7604ea575ca605fd1dd0 /app/assets/javascripts/vue_shared/components/file_finder
parenta483e9271bccdd2cb98cb4f3874fff5d3264d07d (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/file_finder')
-rw-r--r--app/assets/javascripts/vue_shared/components/file_finder/index.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/file_finder/index.vue b/app/assets/javascripts/vue_shared/components/file_finder/index.vue
index a4f13962ebb..012aca8105a 100644
--- a/app/assets/javascripts/vue_shared/components/file_finder/index.vue
+++ b/app/assets/javascripts/vue_shared/components/file_finder/index.vue
@@ -128,7 +128,7 @@ export default {
this.focusedIndex = 0;
}
- Mousetrap.bind(['t', 'command+p', 'ctrl+p'], e => {
+ Mousetrap.bind(['t', 'mod+p'], e => {
if (e.preventDefault) {
e.preventDefault();
}
@@ -142,7 +142,7 @@ export default {
el.classList.contains('inputarea')
) {
return true;
- } else if (combo === 'command+p' || combo === 'ctrl+p') {
+ } else if (combo === 'mod+p') {
return false;
}