diff --git a/Capfile b/Capfile index 34274dea2..c2c5f1a21 100644 --- a/Capfile +++ b/Capfile @@ -13,4 +13,4 @@ require 'capistrano3/unicorn' # Load custom tasks from `lib/capistrano/tasks` if you have any defined Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r } -after "deploy:published", "unicorn:restart" +after "deploy:published", "unicorn:reload" diff --git a/app/views/users/custom_style.css.erb b/app/views/users/custom_style.css.erb index bb59065fd..b074d59cd 100644 --- a/app/views/users/custom_style.css.erb +++ b/app/views/users/custom_style.css.erb @@ -1,4 +1,4 @@ -<% CurrentUser.user.custom_style.split.each do |line| %> +<% CurrentUser.user.custom_style.split(/\r\n|\r|\n/).each do |line| %> <% if line =~ /^@import/ %> <%= raw(line) %> <% else %>