aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* after_commit runs after transactions with non-joinable parentsbrainopia2015-01-165-22/+51
| | | | | | after_commit callbacks run after committing a transaction whose parent is not `joinable?`: un-nested transactions, transactions within test cases, and transactions in `console --sandbox`.
* docs, update "How to run Active Record tests". [ci skip]Yves Senn2015-01-151-1/+5
|
* Merge pull request #18543 from henrik/integer_limit_or_defaultYves Senn2015-01-151-2/+6
|\ | | | | Tiny: DRY default limit in ActiveRecord::Type::Integer
| * DRY default limit in ActiveRecord::Type::IntegerHenrik Nyh2015-01-151-2/+6
| |
* | Merge pull request #18544 from henrik/ar_type_value_commentRafael Mendonça França2015-01-151-2/+1
|\ \ | |/ |/| Tiny: Remove incorrect comment in ActiveRecord::Type::Value
| * Remove incorrect comment in ActiveRecord::Type::ValueHenrik Nyh2015-01-151-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-javascriptAbdelkader Boudih2015-01-151-0/+3
|\ | | | | Adding tip about jQuery UJS [ci skip]
| * Adding tip about jQuery UJS [ci skip]Andrey Nering2015-01-151-0/+3
|/ | | | Reference #18533
* Merge pull request #18539 from aditya-kapoor/correct-typoAbdelkader Boudih2015-01-151-1/+1
|\ | | | | [ci skip] fix typo sill -> still
| * [ci skip] fix typo sill -> stillAditya Kapoor2015-01-151-1/+1
|/
* Merge pull request #18537 from jrnk/patch-1Zachary Scott2015-01-151-1/+1
|\ | | | | Fix Typo SecureToken for schema sample [ci skip]
| * Fix Typo SecureToken for schema sample [ci skip]Jeroen K.2015-01-151-1/+1
| |
* | Merge pull request #15726 from sgrif/sg-time-zone-aware-timesSean Griffin2015-01-158-8/+116
|\ \ | |/ |/| Time columns should support time zone aware attributes
| * Time columns should support time zone aware attributesSean Griffin2015-01-158-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/docrailsVijay Dev2015-01-156-99/+138
|\ \ | |/ |/|
| * Fixed spacing issues on code comments in ActiveJob Basics guide.Vipul A M2015-01-141-7/+9
| | | | | | | | | | Before: http://take.ms/z39h2 After: http://take.ms/Mo0G3
| * GlobalID::Identification has been mixed into AR not AMCristian Bica2015-01-081-1/+1
| |
| * Fix typo "you can be disable"claudiob2015-01-061-1/+1
| | | | | | | | | | | | Closes https://github.com/rails/rails/issues/18372 [ci skip]
| * Better examples for fresh_when and stale?claudiob2015-01-061-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 methodsclaudiob2015-01-032-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 guideKir Shatrov2015-01-031-4/+2
| | | | | | rails/rails#18305, thanks for @dhh suggestion
| * Demonstrate example of `assert_emails` in testing guideKir Shatrov2015-01-031-3/+4
| | | | | | rails/rails#18305, thanks for @dhh suggestion
| * Docs for controller test helpersKir Shatrov2015-01-031-0/+35
| | | | | | | | rails/rails#18305
| * Avoid double negation in test guideKir Shatrov2015-01-031-1/+1
| | | | | | | | rails/rails#18305
| * Section about testing xhr requestsKir Shatrov2015-01-031-0/+13
| | | | | | | | rails/rails#18305
* | Only use the `_before_type_cast` in the form when from user inputSean Griffin2015-01-145-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 Griffin2015-01-141-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 Griffin2015-01-144-3/+13
| | | | | | | | This reverts commit 787e22bb491bd8c36db1e9734261c4ce02c5c5fd.
* | Don't use the `_before_type_cast` version of attributes in the formSean Griffin2015-01-144-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 lockingSean Griffin2015-01-141-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 destroySean Griffin2015-01-141-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 valuesSean Griffin2015-01-143-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/masterRafael Mendonça França2015-01-141-1/+1
|\ \ | | | | | | Correct the views that the mail method sends in API docs.
| * | Correct views mail method sends in API docsAndrew Vida2015-01-141-1/+1
| | |
* | | Merge pull request #18510 from prathamesh-sonpatki/some-more-in-on-githubXavier Noria2015-01-142-2/+2
|\ \ \ | | | | | | | | Changed "in GitHub" to "on GitHub" [ci skip]
| * | | Changed "in GitHub" to "on GitHub" [ci skip]Prathamesh Sonpatki2015-01-142-2/+2
| | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/18503.
* | | | Merge pull request #18509 from prathamesh-sonpatki/cg-typoRobin Dupret2015-01-141-1/+1
|\ \ \ \ | |/ / / |/| | | Fix typo in ActionView CHANGELOG [ci skip]
| * | | Fix typo in ActionView CHANGELOG [ci skip]Prathamesh Sonpatki2015-01-141-1/+1
|/ / /
* | | Merge pull request #18503 from vipulnsward/guides-in-onXavier Noria2015-01-1451-51/+51
|\ \ \ | | | | | | | | Changed `IN` to `ON` in markdown renderer condition
| * | | - Changed `IN` to `ON` in markdown renderer conditionVipul A M2015-01-1451-51/+51
| | | | | | | | | | | | | | | | - Changed `IN` to `ON` in all note sentences in guides.
* | | | require 'rails' if not include_all_railties, just as 'rails/all' doesAkira Matsuda2015-01-141-0/+1
| | | |
* | | | Merge pull request #18500 from nippysaurus/typo_fixYves Senn2015-01-141-1/+1
|\ \ \ \ | | | | | | | | | | Grammar: "By default, Rails loads generators from your load path." [ci skip]
| * | | | improve grammarMichael Dawson2015-01-141-1/+1
| | | | |
* | | | | Merge pull request #18504 from vipulnsward/extract-dateYves Senn2015-01-141-3/+4
|\ \ \ \ \ | | | | | | | | | | | | Extract `Date` header to string constant in Http Response, similar to other headers
| * | | | | Extract `Date` header to string constant in Http Response, similar to other ↵Vipul A M2015-01-141-3/+4
| |/ / / / | | | | | | | | | | | | | | | headers
* | | | | Merge pull request #18502 from y-yagi/fix_autoloading_guideYves Senn2015-01-141-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | fix link in autoloading guide [ci skip]
| * | | | fix link in autoloading guide [ci skip]yuuji.yaginuma2015-01-141-1/+1
|/ / / /
* | | | Merge pull request #18478 from ↵Sean Griffin2015-01-131-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | yoshiokatsuneo/active_record_connection_pool_error_disconnect ActiveRecord: On reconnection failure, release only failed connetion.
| * | | | ActiveRecord: On reconnection failure, release only failed connetion.Yoshioka Tsuneo2015-01-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On reconnection failure, all the connection was released. But, it is better to release only failed connection. This patch changes not to release all the connection but release only failed connection.
* | | | | Merge pull request #18491 from dreeve/form-for-guide-fix-generated-actionAbdelkader Boudih2015-01-131-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix form_for guide binding a form to an object. [ci skip]