Merge branch '17929-issue-shortcut-doesnt-work-on-some-pages' into 'master'
New issue shortcut doesnt work on some pages ## What does this MR do? 1. Slightly tidies dispatcher switch case by utilising 'fall through' cases. 2. Adds shortcuts to project pipelines, milestones, builds and forks pages ## Are there points in the code the reviewer needs to double check? I have a feeling that these may have been missed out of the case statements on purpose? ## Why was this MR needed? Possible UX issue highlighted in #17929. ## What are the relevant issue numbers? Closes #17929. Closes #12616. (dup) Closes #18123. (dup) Closes #13688. (dup) ## Screenshots (if relevant) See merge request !4393
This commit is contained in:
commit
995a59314e
2 changed files with 6 additions and 11 deletions
|
@ -46,6 +46,7 @@ v 8.9.0 (unreleased)
|
|||
- Fix race condition on merge when build succeeds
|
||||
- Links from a wiki page to other wiki pages should be rewritten as expected
|
||||
- Add option to project to only allow merge requests to be merged if the build succeeds (Rui Santos)
|
||||
- Added navigation shortcuts to the project pipelines, milestones, builds and forks page. !4393
|
||||
- Fix issues filter when ordering by milestone
|
||||
- Added artifacts:when to .gitlab-ci.yml - this requires GitLab Runner 1.3
|
||||
- Bamboo Service: Fix missing credentials & URL handling when base URL contains a path (Benjamin Schmid)
|
||||
|
|
|
@ -72,9 +72,7 @@ class Dispatcher
|
|||
new Diff()
|
||||
new ZenMode()
|
||||
shortcut_handler = new ShortcutsNavigation()
|
||||
when 'projects:commits:show'
|
||||
shortcut_handler = new ShortcutsNavigation()
|
||||
when 'projects:activity'
|
||||
when 'projects:commits:show', 'projects:activity'
|
||||
shortcut_handler = new ShortcutsNavigation()
|
||||
when 'projects:show'
|
||||
shortcut_handler = new ShortcutsNavigation()
|
||||
|
@ -133,15 +131,11 @@ class Dispatcher
|
|||
new Project()
|
||||
new ProjectAvatar()
|
||||
switch path[1]
|
||||
when 'compare'
|
||||
shortcut_handler = new ShortcutsNavigation()
|
||||
when 'edit'
|
||||
shortcut_handler = new ShortcutsNavigation()
|
||||
new ProjectNew()
|
||||
when 'new'
|
||||
when 'new', 'show'
|
||||
new ProjectNew()
|
||||
when 'show'
|
||||
new ProjectShow()
|
||||
when 'wikis'
|
||||
new Wikis()
|
||||
shortcut_handler = new ShortcutsNavigation()
|
||||
|
@ -150,9 +144,9 @@ class Dispatcher
|
|||
when 'snippets'
|
||||
shortcut_handler = new ShortcutsNavigation()
|
||||
new ZenMode() if path[2] == 'show'
|
||||
when 'labels', 'graphs'
|
||||
shortcut_handler = new ShortcutsNavigation()
|
||||
when 'project_members', 'deploy_keys', 'hooks', 'services', 'protected_branches'
|
||||
when 'labels', 'graphs', 'compare', 'pipelines', 'forks', \
|
||||
'milestones', 'project_members', 'deploy_keys', 'builds', \
|
||||
'hooks', 'services', 'protected_branches'
|
||||
shortcut_handler = new ShortcutsNavigation()
|
||||
|
||||
# If we haven't installed a custom shortcut handler, install the default one
|
||||
|
|
Loading…
Reference in a new issue