aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make explicit that references and belongs_to types have nil as default value.José Valim2009-07-131-0/+1
* Always allow params to be skipped on action orm in generators.José Valim2009-07-132-3/+3
* Do not require options on class_option.José Valim2009-07-131-1/+1
* Cache source root in a rails specific variable.José Valim2009-07-131-1/+1
* Solving merge conflicts.José Valim2009-07-1212-226/+198
|\
| * Add observing hooks to AResJoshua Peek2009-07-112-2/+62
| * Integrate AMo XML serializer into ARJoshua Peek2009-07-112-131/+31
| * Switch scaffolding templates to HTML 5 doctypeJoshua Peek2009-07-106-89/+80
| * Make it so AR attributes which conflict with object-private methods (e.g. sys...Sam Goldstein2009-07-092-4/+25
* | Do not clean up frameworks on generators environment, otherwise initializers,...José Valim2009-07-091-6/+5
* | Add the new generators environment and update commands.José Valim2009-07-0814-21/+40
* | Generators are configured on initialization if RAILS_ENV=generators.José Valim2009-07-086-94/+169
* | Added config.generators with tests.José Valim2009-07-082-1/+77
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-07-0818-166/+493
|\|
| * Use the i18n gem if present instead of vendor code. [#2871 state:resolved]Lawrence Pit2009-07-071-5/+4
| * Ruby 1.9 style String interpolation support for lower ruby versions. Thanks t...Lawrence Pit2009-07-073-0/+150
| * Add support for dumping non-standard primary keys when using the SQLite3 adap...Hongli Lai (Phusion)2009-07-072-8/+12
| * Adds a audio_tag helper for the HTML5 audio tag. Fixed video_path docs. HTML ...Emilio Tagua2009-07-073-9/+72
| * Get Initializer tests running without requiring parts of Rails being loaded f...Yehuda Katz + Carl Lerche2009-07-066-98/+129
| * Reapply Rails::Application::Path tweaksYehuda Katz + Carl Lerche2009-07-063-46/+126
* | Use active_support/mini since we just need inflections.José Valim2009-07-062-4/+4
* | Make specs pass on Ruby 1.9.José Valim2009-07-063-23/+18
* | Load generators from user home and show a error message if they can't be loaded.José Valim2009-07-043-11/+37
* | Allow scaffold controller to load action_orm files on demand.José Valim2009-07-043-4/+14
* | Ensure that rails templates methods are invoked with the proper extensions [#...José Valim2009-07-042-6/+29
* | Use the proper shebang when using Ruby 1.9 or jruby or windows.José Valim2009-07-042-9/+27
* | Make generators test pass with latest Thor versionJosé Valim2009-07-041-3/+3
* | Search for generators on vendorized plugins and gems.José Valim2009-07-044-7/+17
* | Removed invoke_if and allow hook_for to accept boolean options.José Valim2009-07-043-99/+45
* | Remove update_js from Rakefile and the uneeded railsgen.José Valim2009-07-042-27/+0
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-07-0411-162/+451
|\|
| * Integrate AMo JSON serializer into ARJoshua Peek2009-07-036-172/+134
| * Initial extraction of AMo xml serializerJoshua Peek2009-07-037-20/+346
| * Ensure JSON serializer includes model naming Joshua Peek2009-07-032-1/+2
* | Add some tests for no_color! behavior.José Valim2009-07-035-9/+16
* | More tests for rails generators and lookup.José Valim2009-07-0312-55/+162
* | Removed remaining old generators files.José Valim2009-07-0318-1810/+10
* | Plugin generators now reflect new generators sutrcture.José Valim2009-07-036-7/+9
* | Added lookup to generators.José Valim2009-07-0318-95/+103
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-07-0326-56/+489
|\|
| * Revert "Compact the way application paths are defined"Pratik Naik2009-07-031-13/+27
| * Revert "Modify the Rails::Application::Path object to allow for more concise ...Pratik Naik2009-07-032-113/+19
| * Added tests for the :install_gem_spec_stubs initializerYehuda Katz + Carl Lerche2009-07-027-25/+115
| * Wrote tests for the :check_ruby_version initializerYehuda Katz + Carl Lerche2009-07-021-0/+59
| * Adds support for def self.setup in isolation tests for setup that should be r...Yehuda Katz + Carl Lerche2009-07-023-7/+26
| * Compact the way application paths are definedYehuda Katz + Carl Lerche2009-07-021-27/+13
| * Modify the Rails::Application::Path object to allow for more concise path def...Yehuda Katz + Carl Lerche2009-07-022-19/+113
| * Allow symbols on routes declaration (:controller and :action values) [#2828 s...Jesús García Sáez2009-07-022-0/+11
| * Removed unnecessary calls to image_path and hash lookups [#2827 state:resolved]Yehuda Katz + Carl Lerche2009-07-021-3/+3
| * Fixed ActiveSupport::OrderedHash::[] work identically to ::Hash::[] in ruby 1...Brian Abreu2009-07-022-5/+42