aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | Merge pull request #9065 from atombender/masterRafael Mendonça França2015-01-022-1/+16
|\ \ \ \ \ \
| * | | | | | Fix TaggedLogging to allow loggers to be instantiated multiple times without ...Alexander Staubo2013-01-242-1/+16
* | | | | | | Deprecate `MissingSourceFile` in favor of `LoadError`.Rafael Mendonça França2015-01-024-4/+22
* | | | | | | Merge pull request #8740 from amatsuda/missing_source_fileRafael Mendonça França2015-01-023-27/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | replace use of MissingSourceFile with LoadErrorAkira Matsuda2013-01-043-19/+4
* | | | | | | Don't test invalid log encoding against PostgreSQL adapterRafael Mendonça França2015-01-021-4/+6
| |_|/ / / / |/| | | | |
* | | | | | A quick pass through NestedAttributes' doc [ci skip]Robin Dupret2015-01-021-18/+20
* | | | | | Revert part of 996e646bd8cff3bcf2b13863439f48d3e744cdae [ci skip]Zachary Scott2015-01-022-3/+1
* | | | | | Follow up to #17973 [ci skip]Robin Dupret2015-01-021-9/+10
* | | | | | Merge pull request #17822 from kamipo/refactor_visit_change_column_definitionRafael Mendonça França2015-01-024-16/+14
|\ \ \ \ \ \
| * | | | | | Refactor `visit_ChangeColumnDefinition`Ryuta Kamizono2015-01-032-11/+9
| * | | | | | Add default value for `create_table_definition`Ryuta Kamizono2015-01-033-5/+5