aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' of git://github.com/rails/railsJosé Valim2010-01-1115-200/+124
|\
| * Cleanup junk metal and revise APIJoshua Peek2010-01-105-65/+28
| * Rewrite Metal testsJoshua Peek2010-01-108-135/+86
| * Javascript tests expects the old default of escaping HTML, make it so for nowDavid Heinemeier Hansson2010-01-102-0/+10
| * Use safe_concat instead of trying to html_safe! what might be a frozen stringDavid Heinemeier Hansson2010-01-101-2/+2
* | Send the connection in AR notifications to avoid checking out new connections...José Valim2010-01-112-3/+5
* | Provide useful information when instrumenting partials.José Valim2010-01-111-8/+6
|/
* Raise an error if respond_with is invoked and no format is declared.José Valim2010-01-106-74/+68
* Ensure nested namespaces work as expected.José Valim2010-01-102-7/+16
* Fixes namespaced routes [#3673 status:resolved]Joao Carlos2010-01-102-5/+13
* Have to remove the environment name from ARGV or IRB will freak outDavid Heinemeier Hansson2010-01-091-1/+1
* Add a generator_paths config optionYehuda Katz2010-01-092-5/+13
* Merge remote branch 'eloy/master'José Valim2010-01-0913-31/+125
|\
| * Renamed AssociationReflection #collection_association? to #collection?.Eloy Duran2010-01-085-14/+14
| * Rollback the transaction when one of the autosave associations fails to save....Eloy Duran2010-01-086-5/+78
| * Exclude unchanged records from the collection being considered for autosave. ...Lawrence Pit2010-01-082-12/+7
| * Add failing test that triggers the stack overflowBryan Stearns2010-01-084-0/+26
* | Fix typo by renaming :genre to :gender.José Valim2010-01-093-8/+8
* | Ensure new validates works with uniqueness validator.José Valim2010-01-084-90/+85
* | Fixed that PrototypeHelper#update_page should return html_safe [DHH]David Heinemeier Hansson2010-01-082-1/+3
* | Allow AR::Schema's migrations_path to be overwritten by subclasses. Defaults ...Jeffrey Hardy2010-01-083-3/+11
|/
* Mailer should give self as payload because it contains all the information ne...José Valim2010-01-081-1/+1
* Allow validates to map some types to specific options. So now you can do:José Valim2010-01-084-27/+74
* Compile length validator options still at the class level, so whenever the va...José Valim2010-01-084-48/+26
* Fixed that much of DateHelper wouldn't return html_safe? strings [DHH]David Heinemeier Hansson2010-01-083-5/+29
* Fixed that fragment caching should return a cache hit as html_safe (or it wou...David Heinemeier Hansson2010-01-072-1/+3
* Return-Path per RFC needs '<' and '>' around the addr_specMikel Lindsaar2010-01-081-1/+6
* Liberalize picky testJeremy Kemper2010-01-071-1/+1
* Merge remote branch 'mikel/master'Jeremy Kemper2010-01-071-1/+1
|\
| * Merge branch 'master' of github.com:mikel/railsMikel Lindsaar2010-01-080-0/+0
| |\
| | * Merge branch 'master' of github.com:mikel/railsMikel Lindsaar2010-01-030-0/+0
| | |\
| | | * Silence warning of missing init on @configMikel Lindsaar2010-01-011-0/+1
| | | * Silence @text not initialized warningMikel Lindsaar2010-01-011-1466/+1467
| | * | Updating to Mail 1.5.0, including default values for all Message#field_name m...Mikel Lindsaar2010-01-037-63/+64
| | * | Silence warning of missing init on @configMikel Lindsaar2010-01-031-0/+1
| | * | Silence @text not initialized warningMikel Lindsaar2010-01-031-1466/+1467
| * | | Updating mail requireMikel Lindsaar2010-01-081-1/+1
* | | | Qualify constant lookup in BasicObjectJeremy Kemper2010-01-071-1/+1
|/ / /
* | | Revert "Remove connection method definition, since it's called just once."Jeremy Kemper2010-01-071-1/+5
* | | No more hacks to ensure generators are executed inside Rails.root.José Valim2010-01-073-19/+2
* | | Ensure application names are not singularized.José Valim2010-01-072-3/+8
* | | Run railtie and plugin initializers before app specific onesJoshua Peek2010-01-074-130/+155
* | | Ensure config/application.rb also uses app_const instead of app_name.classify.José Valim2010-01-073-3/+8
* | | Merge remote branch 'eloy/master'José Valim2010-01-076-82/+140
|\ \ \
| * | | Raise a RecordNotFound if an ID in nested attributes is given but doesn't ret...Eloy Duran2010-01-072-4/+31
| * | | Moved the validation logic to the association reflection and refactored autos...Eloy Duran2010-01-074-33/+70
| * | | Remove deprecated '_delete' option from NestedAttributes.Eloy Duran2010-01-072-19/+2
| * | | Removed unnecessary call to #try and cleaned up a bit more.Eloy Duran2010-01-071-6/+4
| * | | Don't use strings for callbacks, as these will be evaled. Rather use symbols,...Eloy Duran2010-01-071-2/+2
| * | | Cleanup some code in nested_attributes.rb, autosave_association.rb, and assoc...Eloy Duran2010-01-074-14/+9