Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #18551 from aditya-kapoor/fix-frozen-hwia | Andrew White | 2015-01-16 | 3 | -1/+15 |
|\ | | | | | Fix assignment for frozen value in HWIA | ||||
| * | Fix assignment for frozen value in HWIA | Aditya Kapoor | 2015-01-17 | 3 | -1/+15 |
| | | |||||
* | | Merge pull request #18556 from jfine/patch-1 | Rafael Mendonça França | 2015-01-16 | 1 | -1/+1 |
|\ \ | | | | | | | Underscore typo [ci skip] | ||||
| * | | Underscore typo [ci skip] | Jared Fine | 2015-01-16 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #18437 from eldano/feed_entry_no_link_option | Santiago Pastorino | 2015-01-16 | 3 | -2/+30 |
|\ \ | | | | | | | Use option url: false to allow entries without a link tag | ||||
| * | | Use option url: false to allow entries without a link tag | Daniel Gomez de Souza | 2015-01-16 | 3 | -2/+30 |
|/ / | |||||
* / | Specify correct version in the changelog [ci skip] | Sean Griffin | 2015-01-16 | 1 | -1/+1 |
|/ | |||||
* | docs, update "How to run Active Record tests". [ci skip] | Yves Senn | 2015-01-15 | 1 | -1/+5 |
| | |||||
* | Merge pull request #18543 from henrik/integer_limit_or_default | Yves Senn | 2015-01-15 | 1 | -2/+6 |
|\ | | | | | Tiny: DRY default limit in ActiveRecord::Type::Integer | ||||
| * | DRY default limit in ActiveRecord::Type::Integer | Henrik Nyh | 2015-01-15 | 1 | -2/+6 |
| | | |||||
* | | Merge pull request #18544 from henrik/ar_type_value_comment | Rafael Mendonça França | 2015-01-15 | 1 | -2/+1 |
|\ \ | |/ |/| | Tiny: Remove incorrect comment in ActiveRecord::Type::Value | ||||
| * | Remove incorrect comment in ActiveRecord::Type::Value | Henrik Nyh | 2015-01-15 | 1 | -2/+1 |
|/ | | | | | | | Says it's only used for the schema, but they are in fact used for other things. Integer verifies against the limit during casting, and Decimal uses precision during casting. It may be true that scale is only used for the schema. | ||||
* | Merge pull request #18541 from andreynering/getting-started-javascript | Abdelkader Boudih | 2015-01-15 | 1 | -0/+3 |
|\ | | | | | Adding tip about jQuery UJS [ci skip] | ||||
| * | Adding tip about jQuery UJS [ci skip] | Andrey Nering | 2015-01-15 | 1 | -0/+3 |
|/ | | | | Reference #18533 | ||||
* | Merge pull request #18539 from aditya-kapoor/correct-typo | Abdelkader Boudih | 2015-01-15 | 1 | -1/+1 |
|\ | | | | | [ci skip] fix typo sill -> still | ||||
| * | [ci skip] fix typo sill -> still | Aditya Kapoor | 2015-01-15 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #18537 from jrnk/patch-1 | Zachary Scott | 2015-01-15 | 1 | -1/+1 |
|\ | | | | | Fix Typo SecureToken for schema sample [ci skip] | ||||
| * | Fix Typo SecureToken for schema sample [ci skip] | Jeroen K. | 2015-01-15 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #15726 from sgrif/sg-time-zone-aware-times | Sean Griffin | 2015-01-15 | 8 | -8/+116 |
|\ \ | |/ |/| | Time columns should support time zone aware attributes | ||||
| * | Time columns should support time zone aware attributes | Sean Griffin | 2015-01-15 | 8 | -8/+116 |
| | | | | | | | | | | | | The types that are affected by `time_zone_aware_attributes` (which is on by default) have been made configurable, in case this is a breaking change for existing applications. | ||||
* | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-01-15 | 6 | -99/+138 |
|\ \ | |/ |/| | |||||
| * | Fixed spacing issues on code comments in ActiveJob Basics guide. | Vipul A M | 2015-01-14 | 1 | -7/+9 |
| | | | | | | | | | | Before: http://take.ms/z39h2 After: http://take.ms/Mo0G3 | ||||
| * | GlobalID::Identification has been mixed into AR not AM | Cristian Bica | 2015-01-08 | 1 | -1/+1 |
| | | |||||
| * | Fix typo "you can be disable" | claudiob | 2015-01-06 | 1 | -1/+1 |
| | | | | | | | | | | | | Closes https://github.com/rails/rails/issues/18372 [ci skip] | ||||
| * | Better examples for fresh_when and stale? | claudiob | 2015-01-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | It is clearer and closer to reality to use `@article.updated_at` as the `:last_modified` parameter of `fresh_when` and `stale?`. Using `@article.created_at` would result in the cache never expiring, since the creation timestamp never changes. [ci skip] | ||||
| * | Fix docs for ActiveSupport::Inflector methods | claudiob | 2015-01-03 | 2 | -81/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many methods in ActiveSupport::Inflector were actually documenting the String methods with the same name. For instance the doc for `camelize` said: > If the argument to +camelize+ is set to <tt>:lower</tt>... while it should say: > If the +uppercase_first_letter+ parameter is set to false [ci skip] | ||||
| * | Better example of `teardown` method in test guide | Kir Shatrov | 2015-01-03 | 1 | -4/+2 |
| | | | | | | rails/rails#18305, thanks for @dhh suggestion | ||||
| * | Demonstrate example of `assert_emails` in testing guide | Kir Shatrov | 2015-01-03 | 1 | -3/+4 |
| | | | | | | rails/rails#18305, thanks for @dhh suggestion | ||||
| * | Docs for controller test helpers | Kir Shatrov | 2015-01-03 | 1 | -0/+35 |
| | | | | | | | | rails/rails#18305 | ||||
| * | Avoid double negation in test guide | Kir Shatrov | 2015-01-03 | 1 | -1/+1 |
| | | | | | | | | rails/rails#18305 | ||||
| * | Section about testing xhr requests | Kir Shatrov | 2015-01-03 | 1 | -0/+13 |
| | | | | | | | | rails/rails#18305 | ||||
* | | Only use the `_before_type_cast` in the form when from user input | Sean Griffin | 2015-01-14 | 5 | -2/+47 |
| | | | | | | | | | | | | While we don't want to change the form input when validations fail, blindly using `_before_type_cast` will cause the input to display the wrong data for any type which does additional work on database values. | ||||
* | | Add tests with an explanation of why we're using `_before_type_cast` | Sean Griffin | 2015-01-14 | 1 | -3/+4 |
| | | | | | | | | | | | | | | If you entered incorrect input into a form (particularly with a numericality validation), we should not replace what you typed in with `0`, since clicking submit a second time would essentially be the same as erroneously accepting the junk input as 0. | ||||
* | | Revert "Don't use the `_before_type_cast` version of attributes in the form" | Sean Griffin | 2015-01-14 | 4 | -3/+13 |
| | | | | | | | | This reverts commit 787e22bb491bd8c36db1e9734261c4ce02c5c5fd. | ||||
* | | Don't use the `_before_type_cast` version of attributes in the form | Sean Griffin | 2015-01-14 | 4 | -13/+3 |
| | | | | | | | | | | | | | | | | | | | | | | We should never be ignoring valuable information that the types may need to give us. The reason that it originally used `_before_type_cast` is unclear, but appears to date back long enough that the reasons may not be relevant today. There is only one test that asserts that it uses the before type cast version, but it gives no context as to why and uses a mock which does not simulate the real world. Fixes #18523. | ||||
* | | Go through normal where logic in destroy with locking | Sean Griffin | 2015-01-14 | 1 | -6/+2 |
| | | | | | | | | | | | | Building the Arel AST, and manipulating the relation manually like this is prone to errors and breakage as implementation details change from underneath it. | ||||
* | | Go through normal where logic in destroy | Sean Griffin | 2015-01-14 | 1 | -9/+1 |
| | | | | | | | | | | | | Building the Arel AST, and manipulating the relation manually like this is prone to errors and breakage as implementation details change from underneath it. | ||||
* | | Don't default to YAML dumping when quoting values | Sean Griffin | 2015-01-14 | 3 | -11/+13 |
| | | | | | | | | | | | | | | This behavior exists only to support fixtures, so we should handle it there. Leaving it in `#quote` can cause very subtle bugs to slip through, by things appearing to work when they should be blowing up loudly, such as #18385. | ||||
* | | Merge pull request #18521 from andrewvida/master | Rafael Mendonça França | 2015-01-14 | 1 | -1/+1 |
|\ \ | | | | | | | Correct the views that the mail method sends in API docs. | ||||
| * | | Correct views mail method sends in API docs | Andrew Vida | 2015-01-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #18510 from prathamesh-sonpatki/some-more-in-on-github | Xavier Noria | 2015-01-14 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Changed "in GitHub" to "on GitHub" [ci skip] | ||||
| * | | | Changed "in GitHub" to "on GitHub" [ci skip] | Prathamesh Sonpatki | 2015-01-14 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/18503. | ||||
* | | | | Merge pull request #18509 from prathamesh-sonpatki/cg-typo | Robin Dupret | 2015-01-14 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Fix typo in ActionView CHANGELOG [ci skip] | ||||
| * | | | Fix typo in ActionView CHANGELOG [ci skip] | Prathamesh Sonpatki | 2015-01-14 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #18503 from vipulnsward/guides-in-on | Xavier Noria | 2015-01-14 | 51 | -51/+51 |
|\ \ \ | | | | | | | | | Changed `IN` to `ON` in markdown renderer condition | ||||
| * | | | - Changed `IN` to `ON` in markdown renderer condition | Vipul A M | 2015-01-14 | 51 | -51/+51 |
| | | | | | | | | | | | | | | | | - Changed `IN` to `ON` in all note sentences in guides. | ||||
* | | | | require 'rails' if not include_all_railties, just as 'rails/all' does | Akira Matsuda | 2015-01-14 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #18500 from nippysaurus/typo_fix | Yves Senn | 2015-01-14 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Grammar: "By default, Rails loads generators from your load path." [ci skip] | ||||
| * | | | | improve grammar | Michael Dawson | 2015-01-14 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #18504 from vipulnsward/extract-date | Yves Senn | 2015-01-14 | 1 | -3/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Extract `Date` header to string constant in Http Response, similar to other headers |