Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-02-22 12:21:03 +0300
committerPhil Hughes <me@iamphill.com>2019-02-22 12:21:03 +0300
commit45b3513f12570e367b6ee4e49306cb6115f97c5f (patch)
tree7da095db39b4a0c0530c58f17df553dbf1aac7ab /app/views
parent321e26f34d7a13594dd5e63734bcb6577e389925 (diff)
parenta1e0f387bfc7c01e41c487b598c3828fa89da397 (diff)
Merge branch '56873-only-load-syntax-highlighting-css-when-selected' into 'master'
Resolve "Only load syntax highlighting css when selected" Closes #57739 and #56873 See merge request gitlab-org/gitlab-ce!25232
Diffstat (limited to 'app/views')
-rw-r--r--app/views/layouts/_head.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 0bb2363f65a..11e83ddfe64 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -38,6 +38,8 @@
= stylesheet_link_tag 'performance_bar' if performance_bar_enabled?
= stylesheet_link_tag 'csslab' if Feature.enabled?(:csslab)
+ = stylesheet_link_tag "highlight/themes/#{user_color_scheme}", media: "all"
+
= Gon::Base.render_data
- if content_for?(:library_javascripts)