Skip to content

Commit

Permalink
Moved contents of rails/init.rb into init.rb to avoid Rails 3 depreca…
Browse files Browse the repository at this point in the history
…tion warnings
  • Loading branch information
Anupam Choudhury committed Feb 7, 2011
1 parent 48359da commit 2fb196f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
9 changes: 8 additions & 1 deletion init.rb
@@ -1 +1,8 @@
require File.dirname(__FILE__)+'/rails/init.rb'
require 'resource_controller'

ActionController::Base.class_eval do
include Urligence
helper_method :smart_url

extend ResourceController::ActionControllerExtension
end
2 changes: 1 addition & 1 deletion lib/resource_controller.rb
Expand Up @@ -23,4 +23,4 @@ def resource_controller(*args)
end
end

require File.dirname(__FILE__)+'/../rails/init.rb' unless ActionController::Base.include?(Urligence)
require File.dirname(__FILE__)+'/../init.rb' unless ActionController::Base.include?(Urligence)
6 changes: 0 additions & 6 deletions rails/init.rb

This file was deleted.

1 change: 0 additions & 1 deletion resource_controller.gemspec
Expand Up @@ -65,7 +65,6 @@ Gem::Specification.new do |s|
"lib/resource_controller/response_collector.rb",
"lib/resource_controller/singleton.rb",
"lib/urligence.rb",
"rails/init.rb",
"test/Rakefile",
"test/app/controllers/accounts_controller.rb",
"test/app/controllers/application_controller.rb",
Expand Down

0 comments on commit 2fb196f

Please sign in to comment.