diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2010-09-05 13:35:46 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-06 13:38:12 +0200 |
| commit | 7204bb0feb6f6a76243749eef2c67b8265a6bba7 (patch) | |
| tree | a470b094f8f56721a505ae25a53df1802acf70f0 /railties/lib/rails | |
| parent | 3bd3e992ffa84242b472d80843b2d3d2c3c7ab8c (diff) | |
| download | rails-7204bb0feb6f6a76243749eef2c67b8265a6bba7.tar.gz rails-7204bb0feb6f6a76243749eef2c67b8265a6bba7.tar.bz2 rails-7204bb0feb6f6a76243749eef2c67b8265a6bba7.zip | |
Remove deprecation warnings in railties
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/actions.rb | 25 | ||||
| -rw-r--r-- | railties/lib/rails/tasks/framework.rake | 17 |
2 files changed, 0 insertions, 42 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb index da64560d83..8f0d5ffff4 100644 --- a/railties/lib/rails/generators/actions.rb +++ b/railties/lib/rails/generators/actions.rb @@ -1,5 +1,4 @@ require 'open-uri' -require 'active_support/deprecation' require 'rbconfig' module Rails @@ -53,20 +52,6 @@ module Rails options = args.extract_options! name, version = args - # Deal with deprecated options - { :env => :group, :only => :group, - :lib => :require, :require_as => :require }.each do |old, new| - next unless options[old] - options[new] = options.delete(old) - ActiveSupport::Deprecation.warn "#{old.inspect} option in gem is deprecated, use #{new.inspect} instead" - end - - # Deal with deprecated source - if source = options.delete(:source) - ActiveSupport::Deprecation.warn ":source option in gem is deprecated, use add_source method instead" - add_source(source) - end - # Set the message to be shown in logs. Uses the git repo if one is given, # otherwise use name (version). parts, message = [ name.inspect ], name @@ -257,16 +242,6 @@ module Rails in_root { run("#{extify(:capify)} .", :verbose => false) } end - # Add Rails to /vendor/rails - # - # ==== Example - # - # freeze! - # - def freeze!(args={}) - ActiveSupport::Deprecation.warn "freeze! is deprecated since your rails app now comes bundled with Rails by default, please check your Gemfile" - end - # Make an entry in Rails routing file config/routes.rb # # === Example diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake index 443dacd739..745a32a1fa 100644 --- a/railties/lib/rails/tasks/framework.rake +++ b/railties/lib/rails/tasks/framework.rake @@ -1,21 +1,4 @@ namespace :rails do - namespace :freeze do - # desc "The rails:freeze:gems is deprecated, please use bundle install instead" - task :gems do - abort "The rails:freeze:gems is deprecated, please use bundle install instead" - end - - # desc 'The freeze:edge command has been deprecated, specify the path setting in your app Gemfile instead and bundle install' - task :edge do - abort 'The freeze:edge command has been deprecated, specify the path setting in your app Gemfile instead and bundle install' - end - end - - # desc 'The unfreeze command has been deprecated, please use bundler commands instead' - task :unfreeze do - abort 'The unfreeze command has been deprecated, please use bundler commands instead' - end - desc "Update both configs and public/javascripts from Rails (or use just update:javascripts or update:configs)" task :update => [ "update:configs", "update:javascripts", "update:scripts", "update:application_controller" ] |