diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-02-22 20:29:38 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-02-22 20:29:38 +0000 |
| commit | 54a5b8831aaaac32b8b5588e59c892e0c27d2f0b (patch) | |
| tree | fa862aa62b70a30fab7eeb9c192f99b2511612a4 /app/assets/javascripts | |
| parent | d10b43dae368dfcee9e8de881a294f20f803a419 (diff) | |
| parent | fbc578a7eced90ccb71687aaefa2d429a5ace63b (diff) | |
| download | gitlab-ce-54a5b8831aaaac32b8b5588e59c892e0c27d2f0b.tar.gz | |
Merge branch 'blame-line-link' into 'master'
Added line links to blame table
Closes #4119
See merge request !2915
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index b17f8e51470..407005d8adf 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -91,7 +91,7 @@ class Dispatcher new TreeView() when 'projects:find_file:show' shortcut_handler = true - when 'projects:blob:show' + when 'projects:blob:show', 'projects:blame:show' new LineHighlighter() shortcut_handler = new ShortcutsNavigation() when 'projects:labels:new', 'projects:labels:edit' |