aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Deprecate eager-evaluated scopes.Jon Leighton2012-03-2120-83/+159
* Avoid obscure &Proc.new thingJon Leighton2012-03-211-2/+2
* Remove valid_scope_name? check - use rubyJon Leighton2012-03-212-30/+1
* no need for castJon Leighton2012-03-211-1/+0
* no need for lvarJon Leighton2012-03-211-3/+1
* split subscribers based on pattern typeAaron Patterson2012-03-211-13/+31
* Merge pull request #5532 from mhfs/migration_blank_lineJosé Valim2012-03-212-1/+2
|\
| * Remove blank line from generated migrationMarcelo Silveira2012-03-202-1/+2
* | Merge pull request #5522 from travisjeffery/fix_migration_generator_adding_re...José Valim2012-03-212-0/+21
|\ \ | |/ |/|
| * Generate Migration Thats Adds Removed IndexTravis Jeffery2012-03-212-0/+21
|/
* We dont need to merge in the parameters as thats all being reset by the rack ...David Heinemeier Hansson2012-03-201-1/+0
* probably should require the objects we monkey patch.Aaron Patterson2012-03-201-0/+1
* search private and protected methods for convert_keyAaron Patterson2012-03-202-3/+3
* bigdecimal can be duped on Ruby 2.0Aaron Patterson2012-03-202-2/+22
* guides location has changed [ci skip]Vijay Dev2012-03-201-1/+1
* Merge pull request #5524 from kennyj/add_missing_requireXavier Noria2012-03-201-0/+1
|\
| * Add missing requirekennyj2012-03-201-0/+1
|/
* Merge pull request #5515 from rafaelfranca/remove-excludeJosé Valim2012-03-192-14/+29
|\
| * Fix secure cookies when there are more than one space before the secureRafael Mendonça França2012-03-192-1/+29
| * Remove exclude option from ActionDispatch::SSLRafael Mendonça França2012-03-192-13/+0
|/
* Merge pull request #5503 from jeyb/leap_day_time_date_time_selectorAndrew White2012-03-193-13/+27
|\
| * Fixes issue #5222: DateTimeSelector builds invalid dates on leap day when dis...Jey Balachandran2012-03-183-13/+27
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-199-23/+122
|\ \
| * | -h also shows help options.Sandeep2012-03-191-1/+1
| * | respond_with description: changed 'response' to 'format'Mark Thomson2012-03-181-1/+1
| * | Revised comments for respond_withMark Thomson2012-03-181-17/+18
| * | Merge remote-tracking branch 'origin/master'Mark Thomson2012-03-177-3/+5
| |\ \
| | * | [getting started] Explain what the create action is accomplishing after param...Ryan Bigg2012-03-171-1/+1
| | * | [getting started] [ci skip] Explain in better terms what we are doing with re...Ryan Bigg2012-03-171-1/+3
| | * | [getting started] [ci skip] Just want to get post paramsRyan Bigg2012-03-171-1/+1
| | * | [getting started] Add imagesRyan Bigg2012-03-176-0/+0
| * | | Merge remote-tracking branch 'origin/master'Mark Thomson2012-03-17533-11025/+2734
| |\| |
| * | | Revised description for responds_withMark Thomson2012-03-171-19/+115
* | | | Merge pull request #5507 from sandeepravi/warning_fixesXavier Noria2012-03-191-1/+1
|\ \ \ \
| * | | | changed all.map to pluckSandeep2012-03-191-1/+1
* | | | | Merge pull request #5508 from FND/tagged_logger_shortcutJosé Valim2012-03-192-2/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Provide access to logger instance within TaggedLogging blocksFND2012-03-192-2/+7
|/ / / /
* | | / Increase minimum version of mail.Mikel Lindsaar2012-03-191-1/+1
| |_|/ |/| |
* | | Merge pull request #5492 from arunagw/build_fix_app_generator_testPiotr Sarnacki2012-03-181-1/+1
|\ \ \
| * | | Build fix for app_generator_test.rbArun Agrawal2012-03-181-1/+1
* | | | Merge pull request #3329 from armstrjare/autosave_collection_new_record_bugJosé Valim2012-03-182-1/+16
|\ \ \ \
| * | | | Fix bug with autosave collection association on new record with a marked for ...Jared Armstrong2012-03-182-1/+16
* | | | | Merge pull request #5496 from atd/masterJosé Valim2012-03-182-2/+11
|\ \ \ \ \
| * | | | | time_tag support for blocksAntonio Tapiador del Dujo2012-03-182-2/+11
|/ / / / /
* | | | | Merge pull request #5486 from kennyj/fix_5435Aaron Patterson2012-03-172-0/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix GH #5435. db:structure:dump should be reenable.kennyj2012-03-172-0/+13
* | | | | Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform onlyPiotr Sarnacki2012-03-171-1/+1
* | | | | Merge pull request #5489 from rdavila/fix_typo_activerecord_testJosé Valim2012-03-171-1/+1
|\ \ \ \ \
| * | | | | Fix typo in ActiveRecord::Relation#blank? testRuben Davila2012-03-171-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #5488 from rafaelfranca/ad-sslJosé Valim2012-03-1710-11/+226
|\ \ \ \ \ | |/ / / / |/| | | |