Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 1 deletions

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index e73e2c943d2..da263949b98 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -55,9 +55,18 @@ jQuery.ajaxSetup({
   },
 });
 
+function disableJQueryAnimations() {
+  $.fx.off = true;
+}
+
+// Disable jQuery animations
+if (gon && gon.disable_animations) {
+  disableJQueryAnimations();
+}
+
 // inject test utilities if necessary
 if (process.env.NODE_ENV !== 'production' && gon && gon.test_env) {
-  $.fx.off = true;
+  disableJQueryAnimations();
   import(/* webpackMode: "eager" */ './test_utils/');
 }