diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-20 18:08:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-20 18:08:30 +0000 |
| commit | 4faa270685797bd689d2035efe7c7e724950eb82 (patch) | |
| tree | 880f35cfcb4ef5dad3c82f701937d27d5cc85389 /app/assets | |
| parent | da23c5d563d68bfa5271b216209a7715c7ce3073 (diff) | |
| download | gitlab-ce-4faa270685797bd689d2035efe7c7e724950eb82.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/super_sidebar/components/nav_item.vue | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js index 7bb6bc7e9bc..33a71c3a65b 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js @@ -33,7 +33,7 @@ export default class ShortcutsNavigation extends Shortcuts { findAndFollowLink('.shortcuts-project-activity'), ); Mousetrap.bind(keysFor(GO_TO_PROJECT_RELEASES), () => - findAndFollowLink('.shortcuts-project-releases'), + findAndFollowLink('.shortcuts-deployments-releases'), ); Mousetrap.bind(keysFor(GO_TO_PROJECT_FILES), () => findAndFollowLink('.shortcuts-tree')); Mousetrap.bind(keysFor(GO_TO_PROJECT_COMMITS), () => findAndFollowLink('.shortcuts-commits')); diff --git a/app/assets/javascripts/super_sidebar/components/nav_item.vue b/app/assets/javascripts/super_sidebar/components/nav_item.vue index 223fbe6d078..ee09a07f5be 100644 --- a/app/assets/javascripts/super_sidebar/components/nav_item.vue +++ b/app/assets/javascripts/super_sidebar/components/nav_item.vue @@ -126,6 +126,7 @@ export default { 'gl-bg-t-gray-a-08': this.isActive, 'gl-py-2': this.isPinnable, 'gl-py-3': !this.isPinnable, + [this.item.link_classes]: this.item.link_classes, ...this.linkClasses, }; }, |