aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/initializable.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-10-02 22:02:12 +0200
committerJosé Valim <jose.valim@gmail.com>2011-10-02 22:08:33 +0200
commitd68884f4fddf5452f1dcbdf1a7b35d5889926fe5 (patch)
tree34f200d7a092bad4fb0a6fb0026d8cd76d637f02 /railties/lib/rails/initializable.rb
parentac1fc5c59499db8d3e875bbd76e0b7c2c9240089 (diff)
downloadrails-d68884f4fddf5452f1dcbdf1a7b35d5889926fe5.tar.gz
rails-d68884f4fddf5452f1dcbdf1a7b35d5889926fe5.tar.bz2
rails-d68884f4fddf5452f1dcbdf1a7b35d5889926fe5.zip
:group => :assets should only run in the assets environment.
Diffstat (limited to 'railties/lib/rails/initializable.rb')
-rw-r--r--railties/lib/rails/initializable.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/initializable.rb b/railties/lib/rails/initializable.rb
index 4c1da0a5a5..04d5b55c69 100644
--- a/railties/lib/rails/initializable.rb
+++ b/railties/lib/rails/initializable.rb
@@ -10,6 +10,7 @@ module Rails
attr_reader :name, :block
def initialize(name, context, options, &block)
+ options[:group] ||= :default
@name, @context, @options, @block = name, context, options, block
end
@@ -48,10 +49,10 @@ module Rails
end
end
- def run_initializers(group=nil, *args)
+ def run_initializers(group=:default, *args)
return if instance_variable_defined?(:@ran)
initializers.tsort.each do |initializer|
- initializer.run(*args) if group.nil? || initializer.belongs_to?(group)
+ initializer.run(*args) if initializer.belongs_to?(group)
end
@ran = true
end