Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

dealing with some -w warnings on startup

  • Loading branch information...
commit 44f07098fe415593e7721afe89e40581d7dc35d3 1 parent 2f88743
@tenderlove tenderlove authored
View
2  activesupport/lib/active_support/i18n_railtie.rb
@@ -38,6 +38,8 @@ def self.reloader
protected
+ @i18n_inited = false
+
# Setup i18n configuration
def self.initialize_i18n(app)
return if @i18n_inited
View
5 railties/lib/rails/application.rb
@@ -55,6 +55,11 @@ def inherited(base)
delegate :default_url_options, :default_url_options=, :to => :routes
+ def initialize
+ super
+ @initialized = false
+ end
+
# This method is called just after an application inherits from Rails::Application,
# allowing the developer to load classes in lib and use them during application
# configuration.
View
2  railties/lib/rails/application/bootstrap.rb
@@ -28,7 +28,7 @@ module Bootstrap
logger.level = ActiveSupport::BufferedLogger.const_get(config.log_level.to_s.upcase)
logger.auto_flushing = false if Rails.env.production?
logger
- rescue StandardError => e
+ rescue StandardError
logger = ActiveSupport::BufferedLogger.new(STDERR)
logger.level = ActiveSupport::BufferedLogger::WARN
logger.warn(
View
1  railties/lib/rails/engine.rb
@@ -360,6 +360,7 @@ def inherited(base)
end
def endpoint(endpoint = nil)
+ @endpoint ||= nil
@endpoint = endpoint if endpoint
@endpoint
end
View
3  railties/lib/rails/plugin.rb
@@ -74,7 +74,8 @@ def config
initializer :load_init_rb, :before => :load_config_initializers do |app|
init_rb = File.expand_path("init.rb", root)
if File.file?(init_rb)
- config = app.config
+ # FIXME: do we call this for side effects??
+ app.config
# TODO: think about evaling initrb in context of Engine (currently it's
# always evaled in context of Rails::Application)
eval(File.read(init_rb), binding, init_rb)
Please sign in to comment.
Something went wrong with that request. Please try again.