diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-17 13:14:55 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-17 13:14:55 +0300 |
| commit | 657d470f448fb4663e8524089aab9d3668d7063c (patch) | |
| tree | 700e4d32231b18b2b826bf3a3d590c2b707d1469 /app/assets/javascripts/merge_request_tabs.js | |
| parent | 11ba759d33b3f59b1dd493ab04dd75f447c0d374 (diff) | |
| parent | 8782bb96cca3ade2b367f588fd8332906dcc2d1b (diff) | |
Merge branch '24010-Add-named-anchors-for-diffs-in-the-commit-page' into 'master'
Adds hash anchors to diff_files to make possible linking exact file in commit
Closes #24010
See merge request !7298
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 5e0257c09a6..b1928f8d279 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -145,7 +145,8 @@ if (action === 'show') { action = 'notes'; } - $(".merge-request-tabs a[data-action='" + action + "']").tab('show').trigger('shown.bs.tab'); + // important note: the .tab('show') method triggers 'shown.bs.tab' event itself + $(".merge-request-tabs a[data-action='" + action + "']").tab('show'); }; // Replaces the current Merge Request-specific action in the URL with a new one |