aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* `sql_type` has been determined already when quoting defaultsRyuta Kamizono2015-01-041-4/+2
* Merge pull request #17227 from claudiob/explicitly-abort-callbacksRafael Mendonça França2015-01-0333-81/+507
|\
| * Add config to halt callback chain on return falseclaudiob2015-01-0212-19/+191
| * Deprecate `false` as the way to halt AR callbacksclaudiob2015-01-0215-47/+191
| * Deprecate `false` as the way to halt AM callbacksclaudiob2015-01-023-6/+15
| * Deprecate `false` as the way to halt AM validation callbacksclaudiob2015-01-023-6/+28
| * Deprecate `false` as the way to halt AS callbacksclaudiob2015-01-024-4/+36
| * Throw :abort halts default CallbackChainsclaudiob2015-01-027-14/+68
| * Loosen test about order of initializersclaudiob2015-01-021-10/+5
* | Remove some warningsRafael Mendonça França2015-01-031-32/+32
* | Merge pull request #18314 from robin850/rm-tmp-sessionsRafael Mendonça França2015-01-035-27/+17
|\ \
| * | Remove the tmp/sessions folder and its clear taskRobin Dupret2015-01-035-27/+17
|/ /
* | Fix a few typos [ci skip]Robin Dupret2015-01-034-5/+5
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-01-0317-40/+74
|\ \
| * | Use Active Model, not ActiveModel in plain Englishclaudiob2015-01-028-10/+10
| * | [ci skip] :scissors: a blank line from code (Active Job Guide).Juanito Fatas2015-01-021-1/+0
| * | Fix doc formatting for `count_by_sql`claudiob2015-01-011-3/+4
| * | Fix "Rendering" not to link to AV::Renderingclaudiob2014-12-251-5/+5
| * | Better docs for NameErrorclaudiob2014-12-251-0/+14
| * | Better docs for AbstractControllerclaudiob2014-12-223-18/+24
| * | Add docs for `Rails.env` and `Rails.env=`claudiob2014-12-221-0/+8
| * | Add docs for `Object.nil!`claudiob2014-12-221-3/+9
* | | Merge pull request #18310 from robin850/guides-improvementsXavier Noria2015-01-036-7/+15
|\ \ \
| * | | Avoid displaying new lines inside note paragraphsRobin Dupret2015-01-033-3/+11
| * | | Consider `html+erb` as a valid language for snippetsRobin Dupret2015-01-031-1/+1
| * | | Update Redcarpet to version 3.2.2Robin Dupret2015-01-032-3/+3
|/ / /
* | | Merge pull request #18309 from PaBLoX-CL/fix-fixtures-referencesRafael Mendonça França2015-01-023-5/+11
|\ \ \
| * | | Generated fixtures won't use parent_id when generated with parent:referencesPablo Olmos de Aguilera Corradini2015-01-022-5/+7
|/ / /
* | | Merge pull request #10380 from JonRowe/test_all_domain_2_letter_tldRafael Mendonça França2015-01-021-0/+7
|\ \ \
| * | | add test asserting that 2 letter tlds with 3 letter domain names work when op...Jon Rowe2013-04-301-0/+7
* | | | Merge pull request #18307 from brainopia/datetime_regressionRafael Mendonça França2015-01-022-1/+13
|\ \ \ \
| * | | | Support datetime values in AR::Type::DateTime#type_cast_for_databasebrainopia2015-01-032-1/+13
* | | | | Merge pull request #18308 from jcoyne/i18n_translate_safetyRafael Mendonça França2015-01-023-19/+20
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Unsafe default translations should not be marked html_safeJustin Coyne2015-01-023-19/+20
* | | | | Merge pull request #18279 from eileencodes/refactor-association-scopeRafael Mendonça França2015-01-024-84/+169
|\ \ \ \ \
| * | | | | Cleanup methods, missing spacing and missing nodocseileencodes2015-01-022-33/+34
| * | | | | Move `#type_caster` to alias tracker initializeeileencodes2015-01-023-13/+10
| * | | | | Add `#all_includes` method to reflectionseileencodes2015-01-022-1/+5
| * | | | | Initialze `#alias_tracker` with base table nameeileencodes2015-01-023-11/+12
| * | | | | Move `alias_candiate` into `AbstractReflection`eileencodes2015-01-022-10/+16
| * | | | | Pass `connection` rather than `alias_tracker`eileencodes2015-01-022-7/+7
| * | | | | Assign the `#alias_name` to each reflectioneileencodes2015-01-022-18/+15
| * | | | | Clean up / refactor new reflection classeseileencodes2015-01-022-92/+76
| * | | | | Refactor `#get_chain` iteration to a linked listeileencodes2015-01-021-14/+21
| * | | | | Refactor `#get_chain` to remove need for `#construct_tables`eileencodes2015-01-021-14/+11
| * | | | | Move `#alias_name` to `ReflectionProxy` classeileencodes2015-01-022-20/+23
| * | | | | Clean up assignments in `#add_constraints`eileencodes2015-01-021-8/+3
| * | | | | Refactor construct_tables methodeileencodes2015-01-022-36/+20
| * | | | | Add RuntimeReflection for recursive access to chaineileencodes2015-01-021-3/+54
| * | | | | Add PolymorphicReflection and constraints methodeileencodes2015-01-022-4/+62