diff options
| author | Hannes Rosenögger <123haynes@gmail.com> | 2015-07-21 22:07:01 +0000 |
|---|---|---|
| committer | Hannes Rosenögger <123haynes@gmail.com> | 2015-07-21 22:07:01 +0000 |
| commit | 815cf7f84309f28af3561e1c9b49d1fa35719c7f (patch) | |
| tree | 928a0c931a5507e04b1a90765f94704b44083d47 | |
| parent | 8ba1a7a03f849cd83a83476c920c2c0572e675d7 (diff) | |
| parent | 65bd871be7112c32065ddd01b166d309c6efe06c (diff) | |
| download | gitlab-ce-815cf7f84309f28af3561e1c9b49d1fa35719c7f.tar.gz | |
Merge branch 'fix-snippet-note-fullscreen' into 'master'
Fix full screen mode for snippet comments
ZenMode is now initialized for snippet pages.
Fixes #2036.
See merge request !1016
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 6920adeaf16..dab74b654b0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.14.0 (unreleased) + - Fix full screen mode for snippet comments (Daniel Gerhardt) - Fix label read access for unauthenticated users (Daniel Gerhardt) - Fix access to disabled features for unauthenticated users (Daniel Gerhardt) - Fix OAuth provider bug where GitLab would not go return to the redirect_uri after sign-in (Stan Hu) diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index 2ab148bc296..81e73799271 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -128,7 +128,10 @@ class Dispatcher shortcut_handler = new ShortcutsNavigation() new ZenMode() new DropzoneInput($('.wiki-form')) - when 'snippets', 'labels', 'graphs' + 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' shortcut_handler = new ShortcutsNavigation() |