Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-06-22 19:27:48 +0300
committerkushalpandya <kushal@gitlab.com>2017-06-23 14:44:10 +0300
commit53971eca64839b92b85de3aa9b77d87e8337d007 (patch)
treea01497c996e92cdd40d383cd56deaaa8ac837269 /app
parent1c33697056b4b49142670696a014390ddbe0dace (diff)
Merge branch '34010-fix-linking-to-parallel-diff-line-number-creating-gray-box' into 'master'
Fix linking to line number on parallel diff creating empty discussion box Closes #34010 See merge request !12332
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/merge_request_tabs.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index 894ed81b044..6162e7a0111 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -284,7 +284,7 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion';
// Scroll any linked note into view
// Similar to `toggler_behavior` in the discussion tab
const hash = window.gl.utils.getLocationHash();
- const anchor = hash && $container.find(`[id="${hash}"]`);
+ const anchor = hash && $container.find(`.note[id="${hash}"]`);
if (anchor && anchor.length > 0) {
const notesContent = anchor.closest('.notes_content');
const lineType = notesContent.hasClass('new') ? 'new' : 'old';