Merge pull request #961 from NARKOZ/load_assets_group

load assets group to allow lazy compilation in production

Merge pull request #961 from NARKOZ/load_assets_group
load assets group to allow lazy compilation in production
Dmitriy Zaporozhets
2 parents d773db8d a21bda5a
Showing 1 changed file with 2 additions and 2 deletions Show diff stats
config/application.rb
@@ -4,9 +4,9 @@ require &#39;rails/all&#39;
  
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))
+  # Bundler.require *Rails.groups(:assets => %w(development test))
   # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
+  Bundler.require(:default, :assets, Rails.env)
 end
  
 module Gitlab
...	...	@@ -4,9 +4,9 @@ require 'rails/all'
4	4
5	5	if defined?(Bundler)
6	6	# If you precompile assets before deploying to production, use this line
7		- Bundler.require *Rails.groups(:assets => %w(development test))
	7	+ # Bundler.require *Rails.groups(:assets => %w(development test))
8	8	# If you want your assets lazily compiled in production, use this line
9		- # Bundler.require(:default, :assets, Rails.env)
	9	+ Bundler.require(:default, :assets, Rails.env)
10	10	end
11	11
12	12	module Gitlab
...	...