diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-16 16:17:51 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-16 16:17:51 +0000 |
| commit | 43befaf25f4f929d01a0af5ef3c2148002be7f4e (patch) | |
| tree | 22767903db243594a502a4b6c92c6449c4f5deee /app/assets | |
| parent | c2746a89f702da91cca24a07a0e5c99634f89218 (diff) | |
| parent | 7e7f266139ca9f4721f18e85e99e9796fd87eca3 (diff) | |
| download | gitlab-ce-43befaf25f4f929d01a0af5ef3c2148002be7f4e.tar.gz | |
Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master'
disable animations for tests
Closes #32194
See merge request !11324
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/test.js | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/test.scss | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/app/assets/javascripts/test.js b/app/assets/javascripts/test.js new file mode 100644 index 00000000000..c4c7918a68f --- /dev/null +++ b/app/assets/javascripts/test.js @@ -0,0 +1 @@ +$.fx.off = true; diff --git a/app/assets/stylesheets/test.scss b/app/assets/stylesheets/test.scss new file mode 100644 index 00000000000..7d9f3da79c5 --- /dev/null +++ b/app/assets/stylesheets/test.scss @@ -0,0 +1,17 @@ +* { + -o-transition: none !important; + -moz-transition: none !important; + -ms-transition: none !important; + -webkit-transition: none !important; + transition: none !important; + -o-transform: none !important; + -moz-transform: none !important; + -ms-transform: none !important; + -webkit-transform: none !important; + transform: none !important; + -webkit-animation: none !important; + -moz-animation: none !important; + -o-animation: none !important; + -ms-animation: none !important; + animation: none !important; +} |