aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5244 from fotos/myqsl2_wait_timeoutRafael Mendonça França2012-05-251-1/+1
|\
| * Maximum wait_timeout on Windows is 2147483Fotos Georgiadis2012-03-021-1/+1
* | Merge pull request #6487 from avakhov/range-sum-optimizationRafael Mendonça França2012-05-252-2/+11
|\ \
| * | Fix Range#sum optimized versionAlexey Vakhov2012-05-252-2/+11
|/ /
* | Merge pull request #4785 from ayamomiji/add-self-to-allow-method-name-using-r...José Valim2012-05-252-4/+26
|\ \
| * | fix `alias_attribute` will raise a syntax error if make an alias on aayaya2012-05-142-4/+26
* | | Remove implicit dependency on pathnameJosé Valim2012-05-252-4/+4
* | | Merge pull request #6482 from waseem/fix_build_4008José Valim2012-05-241-2/+2
|\ \ \
| * | | Fixes build 4008.1Waseem Ahmad2012-05-251-2/+2
|/ / /
* | | Merge pull request #6481 from schneems/schneems/sextant-routesRafael Mendonça França2012-05-241-9/+0
|\ \ \
| * | | remove unnecessary test from route_inspect_testschneems2012-05-241-9/+0
* | | | do not set the ENGINE_PATH to nilAaron Patterson2012-05-241-1/+1
* | | | `name` should be public.Aaron Patterson2012-05-241-12/+12
* | | | Add missing requires for deep_dup and hash ext testCarlos Antonio da Silva2012-05-242-0/+3
* | | | Merge pull request #5925 from Juanmcuello/pg_structure_dumpCarlos Antonio da Silva2012-05-241-2/+2
* | | | Use deep_dup in the deep_transform_keys tests.Rafael Mendonça França2012-05-241-20/+98
* | | | Merge pull request #6461 from schneems/schneems/sextant-routesAndrew White2012-05-2410-14/+104
|\| | |
| * | | Rails::InfoController tests passingschneems2012-05-243-6/+32
| * | | /rails/info/routes path shows routing informationschneems2012-05-247-8/+72
|/ / /
* | | Merge pull request #6471 from parndt/rails_root_should_be_join_ableJosé Valim2012-05-241-1/+1
|\ \ \
| * | | Fixed backward incompatibility for engines.Philip Arndt2012-05-241-1/+1
* | | | Merge pull request #6447 from chancancode/add_backporting_instructions_to_con...Piotr Sarnacki2012-05-231-0/+29
|\ \ \ \ | |/ / / |/| | |
| * | | Added instructions for backporting changes to guides.Godfrey Chan2012-05-231-0/+29
* | | | use File.join rather than depend on PathnameAaron Patterson2012-05-231-1/+1
* | | | Revert "require the constants we use. ensure that root always returns a Pathn...Aaron Patterson2012-05-231-2/+1
* | | | require the constants we use. ensure that root always returns a PathnameAaron Patterson2012-05-231-1/+2
* | | | removing more pathnameismsAaron Patterson2012-05-232-6/+4
* | | | use File.join to decrease dependencies on PathnameAaron Patterson2012-05-231-1/+1
* | | | Merge pull request #6466 from markmcspadden/hash_deep_transform_keysRafael Mendonça França2012-05-234-19/+50
|\ \ \ \
| * | | | Add Hash#deep_transform_keys and Hash#deep_transform_keys! Also convert deep_...Mark McSpadden2012-05-234-19/+50
* | | | | Whitespaces :scissors:Rafael Mendonça França2012-05-232-7/+7
* | | | | PGconn doesn't accepts :checkout_timeout option.Rafael Mendonça França2012-05-231-1/+1
| |/ / / |/| | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-2310-78/+554
|\ \ \ \
| * | | | copy edits in collection proxy docs [ci skip]Vijay Dev2012-05-231-25/+18
| * | | | Revert "Remove Obsolute root specifiying short syntax"Vijay Dev2012-05-231-0/+1
| * | | | Revert "Remove blank trailing comments"Vijay Dev2012-05-23105-0/+192
| * | | | copy edit[ci skip]Vijay Dev2012-05-231-1/+1
| * | | | [Guides] Fix sample codeOscar Del Ben2012-05-231-1/+1
| * | | | [Guides] Rewrite server start sectionOscar Del Ben2012-05-231-8/+23
| * | | | [Guides] Rewrite server start sectionOscar Del Ben2012-05-231-2/+20
| * | | | Fix incorrect example for fields_for - without the '=' it will not output any...David Morton2012-05-221-1/+1
| * | | | clarified how file naming affects load order of initializersRory O’Kane2012-05-221-1/+1
| * | | | add CollectionProxy#length documentationFrancesco Rodriguez2012-05-221-5/+37
| * | | | add CollectionProxy#size documentationFrancesco Rodriguez2012-05-221-2/+25
| * | | | add :call-seq: to +first+ and +last+ CollectionProxy methodsFrancesco Rodriguez2012-05-221-0/+6
| * | | | add CollectionProxy#create! documentationFrancesco Rodriguez2012-05-221-0/+22
| * | | | add CollectionProxy#create documentationFrancesco Rodriguez2012-05-221-0/+33
| * | | | add more examples to CollectionProxy#findFrancesco Rodriguez2012-05-221-0/+9
| * | | | adding :call-seq: to CollectionProxy methodsFrancesco Rodriguez2012-05-221-0/+39
| * | | | add CollectionProxy#build documentationFrancesco Rodriguez2012-05-221-0/+31