aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16795 from Peeja/methods-are-not-duplicableRafael Mendonça França2014-09-033-1/+16
|\
| * Methods are not duplicable.Peter Jaros2014-09-033-1/+16
* | Merge pull request #16787 from cristianbica/fix-globalid-deserializationMatthew Draper2014-09-041-1/+3
|\ \
| * | [Active Job] Try to deserialize with GlobalID only strings and globalidsCristian Bica2014-09-031-1/+3
* | | Merge pull request #16775 from kaspth/ship-secure-sanitizerRafael Mendonça França2014-09-036-53/+8
|\ \ \ | |_|/ |/| |
| * | Ship with rails-html-sanitizer instead.Kasper Timm Hansen2014-09-036-53/+8
* | | Merge pull request #16756 from huoxito/dont-mess-railties-default-orderRafael Mendonça França2014-09-032-8/+45
|\ \ \
| * | | Dont mess with default order engines loadWashington Luiz2014-09-022-8/+45
* | | | extract updating all fixture cache to a method so we can lock laterAaron Patterson2014-09-031-1/+5
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-09-036-17/+247
|\ \ \ \
| * | | | copy edit AS core ext changes [ci skip]Vijay Dev2014-09-031-10/+9
| * | | | Update caching_with_rails.md [ci skip]Harshad Sabne2014-08-311-1/+1
| * | | | Highlight Class/Module [ci skip]Harshad Sabne2014-08-311-1/+1
| * | | | [ci skip] docs grammarschneems2014-08-261-2/+2
| * | | | [ci skip] proper end to sentenceschneems2014-08-261-1/+1
| * | | | [ci skip] use NOTE instead of Noteschneems2014-08-261-1/+1
| * | | | Fix typo in ActiveJob guide [ci skip]प्रथमेश2014-08-261-1/+1
| * | | | [ci skip] fix grammar in docsschneems2014-08-241-1/+1
| * | | | [ci skip] docs can URL cache invalidationschneems2014-08-241-0/+24
| * | | | [ci skip] docs CDN Cache-Control behaviorschneems2014-08-241-0/+24
| * | | | [ci skip] docs CDN header debuggingschneems2014-08-241-0/+48
| * | | | [ci skip] docs CDN caching behaviorschneems2014-08-241-0/+17
| * | | | [ci skip] docs asset_pipeline CDN set upschneems2014-08-241-1/+63
| * | | | [ci skip] docs asset_pipeline#CDNsschneems2014-08-241-13/+21
| * | | | [ci skip] wrap to 80 charsschneems2014-08-241-1/+2
| * | | | code quotes for classnameMikhail Dieterle2014-08-241-1/+1
| * | | | [ci skip] document truncate_wordsRashmi Yadav2014-08-241-0/+33
| * | | | [ci skip ]Document transform_values && transform_values!Rashmi Yadav2014-08-231-0/+14
| * | | | recount files quantityMikhail Dieterle2014-08-231-1/+1
* | | | | schema loading rake tasks maintain database connection for current env.Yves Senn2014-09-034-0/+36
| |_|_|/ |/| | |
* | | | Merge pull request #16785 from cristianbica/fix-double-aj-deserialization-errorMatthew Draper2014-09-032-5/+10
|\ \ \ \
| * | | | Fix for double ActiveJob::DeserializationErorrCristian Bica2014-09-032-5/+10
|/ / / /
* | | | Merge pull request #16263 from zuhao/refactor_activerecord_serialized_attribu...Yves Senn2014-09-030-0/+0
|\ \ \ \
| * | | | reset_column_infomation shouldn't be part of the assertion.Zuhao Wan2014-07-231-1/+1
* | | | | Merge pull request #16780 from viditn91/use-correct-operators-in-queryYves Senn2014-09-031-1/+2
|\ \ \ \ \
| * | | | | use correct operator in query based on JSON documentviditn912014-09-031-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #16781 from kamipo/move_column_option_handlingYves Senn2014-09-032-6/+3
|\ \ \ \ \
| * | | | | Move column option handling to new_column_definitionRyuta Kamizono2014-09-032-6/+3
* | | | | | Reset ActiveRecord::SchemaDumper.ignore_tables value after changed in testsAkira Matsuda2014-09-032-26/+21
* | | | | | Merge pull request #16777 from seuros/testcaseMatthew Draper2014-09-031-0/+1
|\ \ \ \ \ \
| * | | | | | Fix failing tests in ActiveJob AdapterAbdelkader Boudih2014-09-021-0/+1
* | | | | | | Merge pull request #16778 from yahonda/if_existsRafael Mendonça França2014-09-024-6/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove 'if exists' from drop table statement then use `table_exists?`Yasuo Honda2014-09-034-6/+6
|/ / / / / /
* | | | | | Add a quick straw-man Incompatibilities sectionMatthew Draper2014-09-031-0/+129
* | | | | | Merge pull request #16762 from eileencodes/refactor-add_constraints-complex-l...Aaron Patterson2014-09-021-35/+52
|\ \ \ \ \ \
| * | | | | | Break conditional branches into separate methodseileencodes2014-09-011-35/+52
* | | | | | | Merge pull request #16774 from cirosantilli/erb-erubis2Zachary Scott2014-09-021-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Shorten ActionView::Base doc summary line. [ci skip]Ciro Santilli2014-09-021-3/+4
* | | | | | | | Merge pull request #16773 from cirosantilli/erb-erubisZachary Scott2014-09-021-1/+2
|\| | | | | | | | |_|/ / / / / |/| | | | | |
| * | | | | | Clarify Rails uses erubis not stdlin ERB. [ci skip]Ciro Santilli2014-09-021-1/+2
|/ / / / / /