aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16795 from Peeja/methods-are-not-duplicableRafael Mendonça França2014-09-033-1/+16
|\ | | | | Methods are not duplicable.
| * 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 globalids
| * | [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.
| * | 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 load (4.1.6.rc1 regression)
| * | | Dont mess with default order engines loadWashington Luiz2014-09-022-8/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When copying migrations some engines might depend on schema from other engine so we can't blindly reverse all railties collection as that would affect the order they were originally loaded. This patch helps to only apply the order from engines specified in `railties_order`
* | | | 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 methods
| * | | | 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
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Joshua Cody & Yves Senn] Closes #16757. Prior to this patch schema loading rake tasks had the potential to leak a connection to a different database. This had side-effects when rake tasks operating on the current connection (like `db:seed`) were chained.
* | | | Merge pull request #16785 from cristianbica/fix-double-aj-deserialization-errorMatthew Draper2014-09-032-5/+10
|\ \ \ \ | | | | | | | | | | Fix for double ActiveJob::DeserializationErorr
| * | | | Fix for double ActiveJob::DeserializationErorrCristian Bica2014-09-032-5/+10
|/ / / /
* | | | Merge pull request #16263 from ↵Yves Senn2014-09-030-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | zuhao/refactor_activerecord_serialized_attribute_test reset_column_infomation shouldn't be part of the assertion.
| * | | | 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 document [ci skip]
| * | | | | 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_definition
| * | | | | Move column option handling to new_column_definitionRyuta Kamizono2014-09-032-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TableDefinition#column is not called from `add_column`. Use TableDefinition#new_column_definition for column option handling.
* | | | | | 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 Adapter
| * | | | | | 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?`
| * | | | | | Remove 'if exists' from drop table statement then use `table_exists?`Yasuo Honda2014-09-034-6/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Since 'drop table if exists' statement does not always work with some databases such as Oracle.
* | | | | | Add a quick straw-man Incompatibilities sectionMatthew Draper2014-09-031-0/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Is this a thing we want? Note current duplication between the `assert_select` section here, and the corresponding release note entry... does this detail *move* from there to here? [ci skip]
* | | | | | Merge pull request #16762 from ↵Aaron Patterson2014-09-021-35/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | eileencodes/refactor-add_constraints-complex-loop-conditional Refactor add_constraints complex loop conditional
| * | | | | | Break conditional branches into separate methodseileencodes2014-09-011-35/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This breaks the two branches of the `if reflection.last` and `else` to clearer see where the two methods can be refactored. Eventually we hope to remove the need for these separated methods altogether. Move the first branch outside the loop This code doesn't need to be in the loop because it it always affects the last chain. `get_bind_values` and `add_constraints` must match in this context because `get_bind_values` is the caching of `add_constraints` Use each_cons to remove need for `chain[i + 1]` The `chain[i + 1]` is confusing because it's not immediately obvious what it's trying to achieve. The use of `each_cons` makes it clear we need to get the `next_reflection`.
* | | | | | | Merge pull request #16774 from cirosantilli/erb-erubis2Zachary Scott2014-09-021-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Shorten ActionView::Base doc summary line. [ci skip]
| * | | | | | | 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]
| * | | | | | Clarify Rails uses erubis not stdlin ERB. [ci skip]Ciro Santilli2014-09-021-1/+2
|/ / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 06:37:12 +0000