diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-19 14:16:48 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-19 14:16:48 +0000 |
| commit | 73f4df1d6238b3b5b9ea214143918cd0b84b2b8a (patch) | |
| tree | 25549c662637759108cc81c820e92213a4e533de /app/assets/javascripts | |
| parent | 9515e7145281941508ccb7fe223298e6b2415dc8 (diff) | |
| parent | 16c37592835dbd62ef47a7f149a3fe391611ea91 (diff) | |
| download | gitlab-ce-73f4df1d6238b3b5b9ea214143918cd0b84b2b8a.tar.gz | |
Merge branch '9-2-stable-fix-conflicts-for-mr-11427' into '9-2-stable'
Fix 9.2 conflicts for "Scroll to anchor when blob content is loaded"
See merge request !11484
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/blob/viewer/index.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/blob/viewer/index.js b/app/assets/javascripts/blob/viewer/index.js index 5ca8270919d..d06387c0f4d 100644 --- a/app/assets/javascripts/blob/viewer/index.js +++ b/app/assets/javascripts/blob/viewer/index.js @@ -83,6 +83,7 @@ export default class BlobViewer { viewer.setAttribute('data-loaded', 'true'); this.$fileHolder.trigger('highlight:line'); + gl.utils.handleLocationHash(); this.toggleCopyButtonState(); }); |