Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 2 insertions, 0 deletions

diff --git a/app/assets/javascripts/blob/line_highlighter.js b/app/assets/javascripts/blob/line_highlighter.js
index a1f59aa1b54..a8932f8c73b 100644
--- a/app/assets/javascripts/blob/line_highlighter.js
+++ b/app/assets/javascripts/blob/line_highlighter.js
@@ -37,6 +37,7 @@ const LineHighlighter = function (options = {}) {
   options.fileHolderSelector = options.fileHolderSelector || '.file-holder';
   options.scrollFileHolder = options.scrollFileHolder || false;
   options.hash = options.hash || window.location.hash;
+  options.scrollBehavior = options.scrollBehavior || 'smooth';
 
   this.options = options;
   this._hash = options.hash;
@@ -74,6 +75,7 @@ LineHighlighter.prototype.highlightHash = function (newHash) {
         // Scroll to the first highlighted line on initial load
         // Add an offset of -100 for some context
         offset: -100,
+        behavior: this.options.scrollBehavior,
       });
     }
   }