Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 0 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e8bd5ad9b9b..c73cfbcfd22 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -231,6 +231,18 @@ module ApplicationHelper
     "#{request.path}?#{options.compact.to_param}"
   end
 
+  def use_startup_css?
+    params[:startup_css] == 'true' || cookies['startup_css'] == 'true'
+  end
+
+  def stylesheet_link_tag_defer(path)
+    if use_startup_css?
+      stylesheet_link_tag(path, media: "print", onload: "this.onload=null;this.media='all'")
+    else
+      stylesheet_link_tag(path, media: "all")
+    end
+  end
+
   def outdated_browser?
     browser.ie?
   end