diff options
Diffstat (limited to 'activemodel/lib/active_model.rb')
| -rw-r--r-- | activemodel/lib/active_model.rb | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb index 7f943b60ce..803f5b0157 100644 --- a/activemodel/lib/active_model.rb +++ b/activemodel/lib/active_model.rb @@ -21,15 +21,11 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -begin - require 'active_support' -rescue LoadError - activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" - if File.directory?(activesupport_path) - $:.unshift activesupport_path - require 'active_support' - end -end +activesupport_path = "#{File.dirname(__FILE__)}/../../../activesupport/lib" +$:.unshift(activesupport_path) if File.directory?(activesupport_path) +require 'active_support' + +require 'active_support/inflector' module ActiveModel autoload :Base, 'active_model/base' |