Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ci skip] Update 4.2 Release notes with more assert_select information. | Kasper Timm Hansen | 2015-03-24 | 1 | -0/+24 |
| | | | | | Adds documentation for substitutions and why Regexp substitions look different when assertion fails. | ||||
* | Add changelog entry for #19271 | Arthur Neves | 2015-03-24 | 1 | -0/+7 |
| | |||||
* | Revert "Merge pull request #19500 from ccutrer/dry_sti_subclass_finding" | Rafael Mendonça França | 2015-03-24 | 1 | -19/+19 |
| | | | | | | | This reverts commit 5cfa6a8ab997089c3012a82052c8c317b2e095f5, reversing changes made to bfd5bf8313e6ea0bb2eccb68ee5076bb63f0b2db. Reason: This broken travis build. | ||||
* | Merge pull request #19500 from ccutrer/dry_sti_subclass_finding | Rafael Mendonça França | 2015-03-24 | 1 | -19/+19 |
|\ | | | | | DRY up STI subclass logic | ||||
| * | DRY up STI subclass logic | Cody Cutrer | 2015-03-24 | 1 | -19/+19 |
|/ | | | | | | | | | the newer method used for discriminating new records did not use the older and more robust method used for instantiating existing records, but did have a better post-check to ensure the sublass was in the hierarchy. so move the descendants check to find_sti_class, and then simply call find_sti_class from subclass_from_attributes | ||||
* | Merge pull request #19452 from ↵ | Carlos Antonio da Silva | 2015-03-24 | 3 | -1/+19 |
|\ | | | | | | | | | | | pinglamb/fix-referencing-wrong-alias-when-joining-tables-of-has-many-through-association Fix referencing wrong aliases while joining tables of has many through association | ||||
| * | Fix referencing wrong aliases while joining tables of has many through | pinglamb | 2015-03-22 | 3 | -1/+19 |
| | | | | | | | | | | | | | | | | | | | | | | association While joining table of has_many :through association, ActiveRecord will use the actual table name instead of through-join alias. It results with a wrong SQL and exception is raised. This only happens when calculation methods like #count is called. This issue is affecting Rails 4.1.x and 4.2.x as well. | ||||
* | | Merge pull request #19493 from larskanis/add_infinity_test | Yves Senn | 2015-03-24 | 1 | -0/+9 |
|\ \ | | | | | | | PostgreSQL, Add test case for "Infinity" string assignment to float columns | ||||
| * | | PostgreSQL, Add test case for "Infinity" string assignment to float columns. | Lars Kanis | 2015-03-22 | 1 | -0/+9 |
| |/ | | | | | | | This is implemented in Type::Float, but not tested, so far. | ||||
* | | Merge pull request #19488 from yui-knk/fix/comment2 | Yves Senn | 2015-03-24 | 1 | -1/+1 |
|\ \ | | | | | | | [ci skip] Remove unacceptable method name | ||||
| * | | [ci skip] Remove unacceptable method name | yui-knk | 2015-03-24 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #19491 from tgxworld/fix_incorrect_description | Yves Senn | 2015-03-24 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Fix incorrect description for `assert_nothing_raised`. [ci skip] | ||||
| * | | Fix incorrect description for `assert_nothing_raised`. | Guo Xiang Tan | 2015-03-24 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #19485 from tgxworld/small_doc_fix | Rafael Mendonça França | 2015-03-24 | 1 | -1/+1 |
|\ \ | | | | | | | Small doc fix. [CI SKIP] | ||||
| * | | Small doc fix. [CI SKIP] | Guo Xiang Tan | 2015-03-24 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #19481 from davidcornu/activesupport/normalize-to-sentence | Arthur Nogueira Neves | 2015-03-23 | 2 | -1/+7 |
|\ \ \ | | | | | | | | | Make sure Array#to_sentence always returns a String | ||||
| * | | | Make sure Array#to_sentence always returns a String | David Cornu | 2015-03-23 | 2 | -1/+7 |
| |/ / | |||||
* | | | Merge pull request #19482 from mperham/master | Rafael Mendonça França | 2015-03-23 | 2 | -7/+22 |
|\ \ \ | |/ / |/| | | Pass wrapped class name to Sidekiq for logging purposes | ||||
| * | | Pass wrapped class name to Sidekiq for logging purposes | Mike Perham | 2015-03-23 | 2 | -7/+22 |
|/ / | | | | | | | | | | | | | Sidekiq logs the name of the job class being performed. Because ActiveJob wraps the class, this means every job logs as an AJ::JobWrapper instead of the actual class name. Will help fix mperham/sidekiq#2248 | ||||
* | | Merge pull request #19475 from tgxworld/no_one_has_to_suck_anymore | Rafael Mendonça França | 2015-03-23 | 2 | -13/+0 |
|\ \ | | | | | | | Remove alias for `i_suck_and_my_tests_are_order_dependent`. | ||||
| * | | Remove alias for `i_suck_and_my_tests_are_order_dependent`. | Guo Xiang Tan | 2015-03-24 | 2 | -13/+0 |
|/ / | |||||
* | | Fix failing tests for #19474 | Andrew White | 2015-03-23 | 1 | -2/+2 |
| | | |||||
* | | Fix ActionDispatch::PublicExceptions returning string rack status | Ryan Tomayko | 2015-03-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | The status returned in the rack [status, headers, body] array was a string, which can cause problems with middleware that assumes the status will be a Fixnum. This likely never surfaced because other middleware to_i the status returned from downstream apps before passing it on. | ||||
* | | Merge pull request #19473 from nerdinand/duration-to_i-documentation | Yves Senn | 2015-03-23 | 1 | -0/+24 |
|\ \ | | | | | | | Add documentation for Duration#to_i for clarification | ||||
| * | | Add documentation for Duration#to_i for clarification | nerdinand | 2015-03-23 | 1 | -0/+24 |
|/ / | |||||
* | | Merge pull request #19471 from ↵ | Yves Senn | 2015-03-23 | 2 | -30/+0 |
|\ \ | | | | | | | | | | | | | nerdinand/remove-activesupport-integer-example-doc Remove reference to Numeric#from_now, as it is no longer supported [ci skip] | ||||
| * | | Remove reference to Numeric#from_now, as it is no longer supported | nerdinand | 2015-03-23 | 2 | -30/+0 |
|/ / | |||||
* | | Merge pull request #19449 from Gaurav2728/gaurav-unavailable_link | Rafael Mendonça França | 2015-03-23 | 4 | -7/+4 |
|\ \ | | | | | | | remove old unavailable link with relevant fix patch 1 | ||||
| * | | remove old unavailable link with relevant fix | Gaurav Sharma | 2015-03-23 | 4 | -7/+4 |
| | | | |||||
* | | | Merge pull request #19469 from Gaurav2728/gaurav-mysql_missing_links | Rafael Mendonça França | 2015-03-23 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | update mysql link that has been replaced | ||||
| * | | update mysql link that has been replaced | Gaurav Sharma | 2015-03-23 | 1 | -1/+1 |
|/ / | |||||
* | | Provide a more truthful #inspect | Matthew Draper | 2015-03-23 | 1 | -0/+4 |
| | | | | | | | | | | | | This is obviously all very internal, but sometimes you have to look at it... and when you do, it'll save a lot of confusion if it doesn't lie about its identity. | ||||
* | | Make sure to persist a newly-nil serialized value | Matthew Draper | 2015-03-23 | 3 | -1/+20 |
| | | | | | | | | | | | | | | The subtype will (quite reasonably) ignore the possibility that it has `changed_in_place?` by becoming nil. Fixes #19467 | ||||
* | | Simplify setting button form options | Carlos Antonio da Silva | 2015-03-22 | 1 | -2/+3 |
| | | | | | | | | No need to merge hashes when simply setting options does the job. | ||||
* | | Fix arguments order on assertion | Carlos Antonio da Silva | 2015-03-22 | 1 | -1/+1 |
| | | | | | | | | The expected value comes first. Related to #19465. | ||||
* | | Merge pull request #19465 from radanskoric/fix-errors-delete | Rafael Mendonça França | 2015-03-22 | 2 | -7/+13 |
|\ \ | | | | | | | Fix ActiveModel::Errors#delete return value to stay backward compatible | ||||
| * | | Fix ActiveModel::Errors#delete return value to stay backward compatible | Radan Skoric | 2015-03-22 | 2 | -7/+13 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | Rails 5.0 changes to ActiveModel::Errors include addition of `details` that also accidentally changed the return value of `delete`. Since there was no test for that behavior it went unnoticed. This commit adds a test and fixes the regression. Small improvements to comments have also been made. Since `get` is getting deprecated it is better to use `[]` in other methods' code examples. Also, in the module usage example, `def Person.method` was replaced with a more commonly used `def self.method` code style. | ||||
* | | Merge pull request #19455 from jonatack/patch-1 | Carlos Antonio da Silva | 2015-03-22 | 1 | -14/+14 |
|\ \ | | | | | | | [ci skip] Consistent spacing inside hash brackets in Action View guide. | ||||
| * | | [ci skip] Consistent spacing inside hash brackets | Jon Atack | 2015-03-22 | 1 | -14/+14 |
| | | | |||||
* | | | Move #19447 changelog to the top and reword it a bit [ci skip] | Carlos Antonio da Silva | 2015-03-22 | 1 | -6/+8 |
| | | | |||||
* | | | Merge pull request #19434 from kirs/deprecate-alias-method-chain | Rafael Mendonça França | 2015-03-22 | 7 | -108/+150 |
|\ \ \ | | | | | | | | | Deprecate alias_method_chain in favour of Module#prepend | ||||
| * | | | Deprecate alias_method_chain in favour of Module#prepend | Kir Shatrov | 2015-03-22 | 7 | -108/+150 |
| | | | | | | | | | | | | …as discussed #19413 | ||||
* | | | | Merge pull request #19461 from mechanicles/change-a-to-an | Rafael Mendonça França | 2015-03-22 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Change 'a' to 'an' for 'HABTM' word [ci skip] | ||||
| * | | | | Change 'a' to 'an' for 'HABTM' word [ci skip] | Santosh Wadghule | 2015-03-23 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #19460 from yui-knk/feature/add_link | Arthur Nogueira Neves | 2015-03-22 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | [ci skip] Add link for "parameter_names section" | ||||
| * | | | [ci skip] Add link for "parameter_names section" | yui-knk | 2015-03-23 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #19454 from yui-knk/fix/guide_migrations | Abdelkader Boudih | 2015-03-22 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | [ci skip] Change `the null` to `a not null constraint` | ||||
| * | | [ci skip] Change `the null` to `a not null constraint` | yui-knk | 2015-03-22 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #19451 from prathamesh-sonpatki/fix-typo-railties-changelog | Arun Agrawal | 2015-03-22 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo in belongs_to_required_by_default config's CHANGELOG entry [ci... | ||||
| * | | Fix typo in belongs_to_required_by_default config's CHANGELOG entry [ci skip] | Prathamesh Sonpatki | 2015-03-22 | 1 | -1/+1 |
|/ / |