diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 12:07:56 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 12:07:56 +0000 |
commit | 045c0f9554a99c80d0a127540da168e272a9f977 (patch) | |
tree | 2c4b0d10c9432e68b6c1aca2097e663ba18b48ec /app/views/layouts/_head.html.haml | |
parent | 669c24d9276db9a73bbcea40aeab98273aae9e5e (diff) | |
download | gitlab-ce-045c0f9554a99c80d0a127540da168e272a9f977.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts/_head.html.haml')
-rw-r--r-- | app/views/layouts/_head.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 0060d8323b0..6b336f3eba2 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -46,7 +46,7 @@ = stylesheet_link_tag "application", media: "all" = stylesheet_link_tag "print", media: "print" - = stylesheet_link_tag "test", media: "all" if Rails.env.test? + = stylesheet_link_tag "disable_animations", media: "all" if Rails.env.test? || Gitlab.config.gitlab['disable_animations'] = stylesheet_link_tag 'performance_bar' if performance_bar_enabled? = stylesheet_link_tag "highlight/themes/#{user_color_scheme}", media: "all" |