diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-19 08:19:39 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-19 08:19:39 -0700 |
| commit | 6df96c90ab3623915514e29bf796aeb49e3fa08e (patch) | |
| tree | ddfaca33cfbd599868790001875fa07a5c18fb2e /railties/lib/rails | |
| parent | 26bdcf7299a44b45242e2e4be209b325cfe6bfb4 (diff) | |
| parent | 8d3cd530c4d165b1bbd2e551d491dd81e2c3bff0 (diff) | |
| download | rails-6df96c90ab3623915514e29bf796aeb49e3fa08e.tar.gz rails-6df96c90ab3623915514e29bf796aeb49e3fa08e.tar.bz2 rails-6df96c90ab3623915514e29bf796aeb49e3fa08e.zip | |
Merge pull request #3359 from mrreynolds/datamapper_naming_fix
Fixed DataMapper namings in symbols and constants.
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/engine/configuration.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/active_model.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb index d3b42021fc..e31df807a6 100644 --- a/railties/lib/rails/engine/configuration.rb +++ b/railties/lib/rails/engine/configuration.rb @@ -20,7 +20,7 @@ module Rails # Holds generators configuration: # # config.generators do |g| - # g.orm :datamapper, :migration => true + # g.orm :data_mapper, :migration => true # g.template_engine :haml # g.test_framework :rspec # end diff --git a/railties/lib/rails/generators/active_model.rb b/railties/lib/rails/generators/active_model.rb index 454327f765..0e51b9c568 100644 --- a/railties/lib/rails/generators/active_model.rb +++ b/railties/lib/rails/generators/active_model.rb @@ -11,7 +11,7 @@ module Rails # ActiveRecord::Generators::ActiveModel.find(Foo, "params[:id]") # # => "Foo.find(params[:id])" # - # Datamapper::Generators::ActiveModel.find(Foo, "params[:id]") + # DataMapper::Generators::ActiveModel.find(Foo, "params[:id]") # # => "Foo.get(params[:id])" # # On initialization, the ActiveModel accepts the instance name that will |