aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Adds migration and schema dump support for INET, CIDR, and MACADDRDan Seaver2012-05-053-7/+47
* Try to convert object passed to debug_hash to hashPiotr Sarnacki2012-05-051-2/+2
* Merge pull request #6169 from marcandre/respond_to_missingJosé Valim2012-05-056-6/+24
|\
| * Use respond_to_missing for TimeWithZoneMarc-Andre Lafortune2012-05-052-3/+4
| * Use respond_to_missing? for CharsMarc-Andre Lafortune2012-05-052-2/+11
| * Use respond_to_missing? for OrderedOptionsMarc-Andre Lafortune2012-05-052-1/+9
* | Give more detailed instructions in script/rails in enginePiotr Sarnacki2012-05-041-0/+4
* | Duplicate column_defaults properly (closes #6115)Piotr Sarnacki2012-05-043-2/+12
* | Change unless + ! into ifPiotr Sarnacki2012-05-041-1/+1
* | Merge pull request #3713 from kf8a/masterAaron Patterson2012-05-042-2/+19
|\ \
| * | postgresql adapter handles quoting of not a number (NaN) and InfinitySven Bohm2011-11-212-2/+19
* | | need to dup the default options so that mutations will not impact usAaron Patterson2012-05-041-1/+1
* | | make sure the superclass matches so load order does not matterAaron Patterson2012-05-042-2/+2
* | | Merge pull request #6156 from mjtko/feature-beginning_of_hourJeremy Kemper2012-05-045-0/+56
|\ \ \
| * | | added beginning_of_hour support to core_ext calculations for Time and DateTimeMark J. Titorenko2012-05-045-0/+56
* | | | Merge pull request #6163 from carlosantoniodasilva/wrap-params-refactorJeremy Kemper2012-05-041-1/+1
|\ \ \ \
| * | | | Use Hash#fetch instead of has_key? checkCarlos Antonio da Silva2012-05-041-1/+1
* | | | | Merge pull request #6157 from mjtko/fix-activesupport-time_with_zone-testsAndrew White2012-05-041-8/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | enable tests for beginning_of_* and end_of_* within time zone tests; enable t...Mark J. Titorenko2012-05-041-8/+8
| |/ / /
* | | | Merge pull request #4445 from nragaz/role_based_params_wrappingJosé Valim2012-05-042-4/+18
* | | | Merge pull request #5808 from avakhov/assert-template-layout-improveJosé Valim2012-05-043-6/+60
|\ \ \ \
| * | | | Improve assert_template layout checkingAlexey Vakhov2012-05-042-3/+30
| * | | | Fix assert_template :layout => nil assertionAlexey Vakhov2012-05-042-2/+17
| * | | | Fix assert_template assertion with :layout optionAlexey Vakhov2012-05-043-1/+13
|/ / / /
* | | | Merge pull request #6160 from carlosantoniodasilva/resource-route-canonical-a...Aaron Patterson2012-05-043-5/+13
|\ \ \ \
| * | | | Force given path to http methods in mapper to skip canonical action checkingCarlos Antonio da Silva2012-05-043-5/+13
* | | | | fix doc [ci skip]Vijay Dev2012-05-041-1/+1
* | | | | session creation methods to a moduleAaron Patterson2012-05-043-24/+11
* | | | | Merge pull request #6154 from shaliko/patch-1Vijay Dev2012-05-041-1/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update documentation for button_to.Shalva Usubov2012-05-041-1/+6
| |/ / /
* | | | update invalid partial error message as per 04202a3f8d66c0675eac41fbf63309f4b...Vijay Dev2012-05-041-4/+4
* | | | Merge pull request #6159 from marcandre/fix_bad_partial_error_messVijay Dev2012-05-041-2/+2
|\ \ \ \
| * | | | Adjust error message for partial names starting with an uppercase letter.Marc-Andre Lafortune2012-05-041-2/+2
* | | | | create a request session in the cookie storesAaron Patterson2012-05-041-0/+8
* | | | | create a request::session object in the memecache store middlewareAaron Patterson2012-05-041-0/+10
|/ / / /
* | | | Merge branch 'master' into sessionAaron Patterson2012-05-0467-853/+881
|\| | |
| * | | extract deprecated dynamic methodsJon Leighton2012-05-042-142/+40
| * | | Merge pull request #6153 from carlosantoniodasilva/queue-consumerJosé Valim2012-05-048-23/+89
| |\ \ \
| | * | | Add some docs and changelog entryCarlos Antonio da Silva2012-05-043-13/+21
| | * | | Allow overriding exception handling in threaded consumerCarlos Antonio da Silva2012-05-042-1/+24
| | * | | Allow configuring a different queue consumerCarlos Antonio da Silva2012-05-044-9/+44
| * | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-0420-377/+150
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix ActiveModel README exampleAlexey Vakhov2012-05-041-1/+1
| | * | | mention database mapping in getting started guideOscar Del Ben2012-05-041-1/+4
| | * | | Remove vestiges of the http_only! config from configuring guideCarlos Antonio da Silva2012-05-031-8/+0
| | * | | Update command line guideOscar Del Ben2012-05-031-4/+2
| | * | | I found it strange that this guide is redirecting questions to a specific per...Paul McMahon2012-05-031-2/+1
| | * | | Corrected the name of the module that should be included to get the url helpers.Anuj Dutta2012-05-031-1/+1
| | * | | TypoOscar Del Ben2012-05-021-1/+1
| | * | | Mention mac os x installation tools on getting started guideOscar Del Ben2012-05-021-1/+4