Merge remote-tracking branch 'upstream/master'

1 files changed, 7 insertions, 2 deletions

diff --git a/railties/lib/rails/initializable.rb b/railties/lib/rails/initializable.rb
index 686a2dc0cb..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
 
@@ -21,6 +22,10 @@ module Rails
         @options[:after]
       end
 
+      def belongs_to?(group)
+        @options[:group] == group || @options[:group] == :all
+      end
+
       def run(*args)
         @context.instance_exec(*args, &block)
       end
@@ -44,10 +49,10 @@ module Rails
       end
     end
 
-    def run_initializers(*args)
+    def run_initializers(group=:default, *args)
       return if instance_variable_defined?(:@ran)
       initializers.tsort.each do |initializer|
-        initializer.run(*args)
+        initializer.run(*args) if initializer.belongs_to?(group)
       end
       @ran = true
     end