aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2008-06-0264-406/+921
|\
| * Added Rack middleware to handle static files.Joshua Peek2008-06-013-0/+41
| * Added Rack processorEzra Zygmuntowicz2008-06-016-1/+515
| * Added SQL escaping for :limit and :offset in MySQL [Jonathan Wiess]David Heinemeier Hansson2008-06-013-2/+8
| * Previously we only added the "lib" subdirectory to the load path whenrick2008-05-311-1/+3
| * fix changelog conflictrick2008-05-3124-304/+69
| |\
| | * revert mysql test credential changeJeremy Kemper2008-05-311-2/+2
| | * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-05-314-262/+7
| | |\
| | | * Remove dead code, and the tests for it.Michael Koziarski2008-05-312-261/+0
| | | * Substitute value into validates_format_of messageJohn D. Hume2008-05-312-1/+7
| | * | Making ready for release of 2.1David Heinemeier Hansson2008-05-3119-43/+36
| | |/
| | * Added SQL escaping for :limit and :offset [#288 state:closed] (Aaron Bedra, S...David Heinemeier Hansson2008-05-312-2/+27
| * | Add ActiveRecord::Base.sti_name that checks ActiveRecord::Base#store_full_sti...rick2008-05-314-6/+32
| |/
| * fix doc typosrick2008-05-311-2/+1
| * Expose GemPlugin load_paths so they can be added to Dependencies.load_paths. ...Dmitriy Timokhin2008-05-311-10/+6
| * Consolidate error messages for missing gems, and skip them when running rake ...rick2008-05-314-16/+42
| * Merge branch 'master' of git@github.com:rails/railsrick2008-05-316-19/+34
| |\
| | * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-05-319-36/+83
| | |\
| | | * Ruby 1.8.7 compat: work around broken DelegateClass#respond_to?Jeremy Kemper2008-05-311-0/+6
| | | * Removed suggestion for turning off partial updates.Joshua Peek2008-05-311-4/+1
| | | * Don't provide the password with dbconsole unless explicitly opted in.Michael Koziarski2008-05-311-3/+11
| | | * Ruby 1.8.7 compat: TimeWithZone# and Chars#respond_to? pass along the include...Jeremy Kemper2008-05-312-9/+11
| | * | Added better error message for when the class name is already used (and dont ...David Heinemeier Hansson2008-05-311-3/+5
| * | | fix Gem installation command with versionsrick2008-05-312-2/+8
| * | | Run gem install as external command. [#210 state:resolved]Tim Morgan2008-05-311-1/+5
| | |/ | |/|
| * | Merge branch 'master' of git@github.com:rails/railsrick2008-05-312-15/+24
| |\ \
| | * | Fixed Dependencies so load errors are not masked behind a 'Expected x.rb to d...Tom Ward2008-05-312-15/+24
| | |/
| * | Merge branch 'master' of git@github.com:technoweenie/railsrick2008-05-310-0/+0
| |\ \
| | * | belongs_to polymorphic association assignments update the foreign_id and fore...Tim Harper2008-05-312-5/+30
| | |/
| * / belongs_to polymorphic association assignments update the foreign_id and fore...Tim Harper2008-05-312-5/+30
| |/
| * Fix default nil tests for MySQL 5.0.51 [#192 state:resolved]Ryan Bates2008-05-311-1/+1
| * Ensure query assertion counts are the same when partial updates are enabledJeremy Kemper2008-05-302-0/+3
| * Enable partial updates by defaultJeremy Kemper2008-05-301-1/+1
| * Require ruby-prof 0.6.1 or later. Use resume/pause to omit extraneous machine...Jeremy Kemper2008-05-301-8/+17
| * git ignore rubinius .rbc filesJeremy Kemper2008-05-301-0/+1
| * Ensure script/plugin installs ssh/git plugins. [#277 state:resolved]Tekin Suleyman2008-05-291-1/+1
| * Ensure :select passed in options overrides the one from the scope. [#239 stat...Andrew White2008-05-292-1/+17
| * Add ActionMailer#reply_to. [#245 state:resolved]Adam2008-05-293-8/+48
| * Ensure AssociationCollection#count works with empty condition. [#271 state:re...Pratik Naik2008-05-292-1/+5
| * Ensure correct db time is reported in production logs.Pratik Naik2008-05-281-9/+5
| * Ensure named_scope#empty? uses count query. [#262 state:resolved]Ryan Bates2008-05-282-1/+13
* | fixed typo: extra wordGrant Hollingworth2008-06-021-1/+1
* | Fix spelling in deprecation warning (affect -> effect)Chris Kampmeier2008-05-311-1/+1
* | Make a note about script/destroy in 'script/generate scaffold' usage descript...Cheah Chu Yeow2008-05-313-14/+17
* | added final tree structure, changed String to String.class_eval doJeff Dean2008-05-301-4/+40
* | made the headings more consistentJeff Dean2008-05-301-15/+16
* | added documentation for rake tasks to the plugin tutorialJeff Dean2008-05-291-0/+22
* | Added a tutorial for how to create and test pluginsJeff Dean2008-05-291-0/+803
* | first draft on helpersBill Garr2008-05-291-0/+91
* | First draft of the ActionView Partials guide.Nick Laiacona2008-05-291-0/+91