Skip to content

Loading…

refactor lazy_load_hooks load position, fix #6435 #6439

Merged
merged 1 commit into from

4 participants

@janx

No description provided.

@josevalim josevalim merged commit 6b9f077 into rails:master
@rafaelfranca
Ruby on Rails member

cc @drogus

@rafaelfranca
Ruby on Rails member

ooops. @josevalim was faster.

@spastorino
Ruby on Rails member

Why requiring that in activesupport/lib/active_support.rb ?

@yahonda yahonda referenced this pull request
Merged

remove useless require #6435

@janx

@spastorino It's used outside activesupport and was required at inappropriate places: #6435

@spastorino
Ruby on Rails member

@janx sorry didn't follow what you mean, but why not https://gist.github.com/4e5f45487142d3e5b2c6 ?
I'm requiring it where is needed.

@spastorino
Ruby on Rails member

Ok the build is still broken http://travis-ci.org/#!/rails/rails/jobs/1400201
Pushed this 38293ea

@janx

@spastorino that's better, thanks!

@spastorino
Ruby on Rails member

@janx actually you were right but we can't remove the require from i18n, fixed here 344ea04

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 22, 2012
  1. @janx
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 1 deletion.
  1. +1 −0 activesupport/lib/active_support.rb
  2. +0 −1 activesupport/lib/active_support/i18n.rb
View
1 activesupport/lib/active_support.rb
@@ -25,6 +25,7 @@
require "active_support/dependencies/autoload"
require "active_support/version"
require "active_support/logger"
+require "active_support/lazy_load_hooks"
module ActiveSupport
extend ActiveSupport::Autoload
View
1 activesupport/lib/active_support/i18n.rb
@@ -1,6 +1,5 @@
begin
require 'i18n'
- require 'active_support/lazy_load_hooks'
rescue LoadError => e
$stderr.puts "The i18n gem is not available. Please add it to your Gemfile and run bundle install"
raise e
Something went wrong with that request. Please try again.