summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-07-18 00:39:08 +0000
committerRobert Speicher <robert@gitlab.com>2015-07-18 00:39:08 +0000
commit4998f7a0b5abf137abce8258beda28fe06d3803d (patch)
tree4dafaccc78e3687c3eca5c91273a6821ef83d915
parenta84ed6eb234c9a9f0e5e5c0deea1779d224764a8 (diff)
parent5bac64552d7852691edb3fed80723bc74ee62e33 (diff)
downloadgitlab-ce-4998f7a0b5abf137abce8258beda28fe06d3803d.tar.gz
Merge branch 'fix-line-highlighter-link-click' into 'master'
Fix bug where clicking on the link icon on a file would result in "#Lundefined" in the URL Closes #2002 See merge request !988
-rw-r--r--app/assets/javascripts/line_highlighter.js.coffee2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/line_highlighter.js.coffee b/app/assets/javascripts/line_highlighter.js.coffee
index a8b3c1fa33e..e604e6025c2 100644
--- a/app/assets/javascripts/line_highlighter.js.coffee
+++ b/app/assets/javascripts/line_highlighter.js.coffee
@@ -70,7 +70,7 @@ class @LineHighlighter
@clearHighlight()
- lineNumber = $(event.target).data('line-number')
+ lineNumber = $(event.target).closest('a').data('line-number')
current = @hashToRange(@_hash)
unless current[0] && event.shiftKey