Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16775 from kaspth/ship-secure-sanitizer | Rafael Mendonça França | 2014-09-03 | 6 | -53/+8 |
|\ | | | | | Ship with rails-html-sanitizer instead. | ||||
| * | Ship with rails-html-sanitizer instead. | Kasper Timm Hansen | 2014-09-03 | 6 | -53/+8 |
| | | |||||
* | | Merge pull request #16756 from huoxito/dont-mess-railties-default-order | Rafael Mendonça França | 2014-09-03 | 2 | -8/+45 |
|\ \ | | | | | | | Dont mess with default order engines load (4.1.6.rc1 regression) | ||||
| * | | Dont mess with default order engines load | Washington Luiz | 2014-09-02 | 2 | -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 later | Aaron Patterson | 2014-09-03 | 1 | -1/+5 |
| | | | |||||
* | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-09-03 | 6 | -17/+247 |
|\ \ \ | |||||
| * | | | copy edit AS core ext changes [ci skip] | Vijay Dev | 2014-09-03 | 1 | -10/+9 |
| | | | | |||||
| * | | | Update caching_with_rails.md [ci skip] | Harshad Sabne | 2014-08-31 | 1 | -1/+1 |
| | | | | | | | | | | | | Highlight methods | ||||
| * | | | Highlight Class/Module [ci skip] | Harshad Sabne | 2014-08-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] docs grammar | schneems | 2014-08-26 | 1 | -2/+2 |
| | | | | |||||
| * | | | [ci skip] proper end to sentence | schneems | 2014-08-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] use NOTE instead of Note | schneems | 2014-08-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix typo in ActiveJob guide [ci skip] | प्रथमेश | 2014-08-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] fix grammar in docs | schneems | 2014-08-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] docs can URL cache invalidation | schneems | 2014-08-24 | 1 | -0/+24 |
| | | | | |||||
| * | | | [ci skip] docs CDN Cache-Control behavior | schneems | 2014-08-24 | 1 | -0/+24 |
| | | | | |||||
| * | | | [ci skip] docs CDN header debugging | schneems | 2014-08-24 | 1 | -0/+48 |
| | | | | |||||
| * | | | [ci skip] docs CDN caching behavior | schneems | 2014-08-24 | 1 | -0/+17 |
| | | | | |||||
| * | | | [ci skip] docs asset_pipeline CDN set up | schneems | 2014-08-24 | 1 | -1/+63 |
| | | | | |||||
| * | | | [ci skip] docs asset_pipeline#CDNs | schneems | 2014-08-24 | 1 | -13/+21 |
| | | | | |||||
| * | | | [ci skip] wrap to 80 chars | schneems | 2014-08-24 | 1 | -1/+2 |
| | | | | |||||
| * | | | code quotes for classname | Mikhail Dieterle | 2014-08-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] document truncate_words | Rashmi Yadav | 2014-08-24 | 1 | -0/+33 |
| | | | | |||||
| * | | | [ci skip ]Document transform_values && transform_values! | Rashmi Yadav | 2014-08-23 | 1 | -0/+14 |
| | | | | |||||
| * | | | recount files quantity | Mikhail Dieterle | 2014-08-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | schema loading rake tasks maintain database connection for current env. | Yves Senn | 2014-09-03 | 4 | -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-error | Matthew Draper | 2014-09-03 | 2 | -5/+10 |
|\ \ \ \ | | | | | | | | | | | Fix for double ActiveJob::DeserializationErorr | ||||
| * | | | | Fix for double ActiveJob::DeserializationErorr | Cristian Bica | 2014-09-03 | 2 | -5/+10 |
|/ / / / | |||||
* | | | | Merge pull request #16263 from ↵ | Yves Senn | 2014-09-03 | 0 | -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 Wan | 2014-07-23 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #16780 from viditn91/use-correct-operators-in-query | Yves Senn | 2014-09-03 | 1 | -1/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | use correct operator in query based on JSON document [ci skip] | ||||
| * | | | | | use correct operator in query based on JSON document | viditn91 | 2014-09-03 | 1 | -1/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #16781 from kamipo/move_column_option_handling | Yves Senn | 2014-09-03 | 2 | -6/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Move column option handling to new_column_definition | ||||
| * | | | | | Move column option handling to new_column_definition | Ryuta Kamizono | 2014-09-03 | 2 | -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 tests | Akira Matsuda | 2014-09-03 | 2 | -26/+21 |
| | | | | | | |||||
* | | | | | | Merge pull request #16777 from seuros/testcase | Matthew Draper | 2014-09-03 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix failing tests in ActiveJob Adapter | ||||
| * | | | | | | Fix failing tests in ActiveJob Adapter | Abdelkader Boudih | 2014-09-02 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #16778 from yahonda/if_exists | Rafael Mendonça França | 2014-09-02 | 4 | -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 Honda | 2014-09-03 | 4 | -6/+6 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Since 'drop table if exists' statement does not always work with some databases such as Oracle. | ||||
* | | | | | | Add a quick straw-man Incompatibilities section | Matthew Draper | 2014-09-03 | 1 | -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 Patterson | 2014-09-02 | 1 | -35/+52 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eileencodes/refactor-add_constraints-complex-loop-conditional Refactor add_constraints complex loop conditional | ||||
| * | | | | | | Break conditional branches into separate methods | eileencodes | 2014-09-01 | 1 | -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-erubis2 | Zachary Scott | 2014-09-02 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Shorten ActionView::Base doc summary line. [ci skip] | ||||
| * | | | | | | | Shorten ActionView::Base doc summary line. [ci skip] | Ciro Santilli | 2014-09-02 | 1 | -3/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #16773 from cirosantilli/erb-erubis | Zachary Scott | 2014-09-02 | 1 | -1/+2 |
|\| | | | | | | | |_|/ / / / / |/| | | | | | | Clarify Rails uses erubis not stdlin ERB. [ci skip] | ||||
| * | | | | | | Clarify Rails uses erubis not stdlin ERB. [ci skip] | Ciro Santilli | 2014-09-02 | 1 | -1/+2 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #16772 from satoryu/master | Zachary Scott | 2014-09-02 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove '*' which doesn't belong [ci skip] | ||||
| * | | | | | | Remove '*' which doesn't work | Tatsuya Sato | 2014-09-03 | 1 | -1/+1 |
|/ / / / / / | | | | | | | | | | | | | I found an * does not work in Markdown notation. It should be removed. | ||||
* | | | | | | Merge pull request #16770 from arthurnn/add_string_strip_require | Rafael Mendonça França | 2014-09-02 | 3 | -1/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add and Remove string/strip require | ||||
| * | | | | | | Add and Remove string/strip require | Arthur Neves | 2014-09-02 | 3 | -1/+3 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Method .strip_heredoc is defined in active_support/core_ext/string/strip.rb so we need to require it. [fixes #16677] |