Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16793 from javan/comply_with_rack_content_length_middleware | Jeremy Kemper | 2014-09-06 | 2 | -0/+18 |
|\ | | | | | Add support for Rack::ContentLength middelware | ||||
| * | Add support for Rack::ContentLength middelware | Javan Makhmali | 2014-09-06 | 2 | -0/+18 |
|/ | |||||
* | Dynamically modified schema and association would not be correctly reset | Akira Matsuda | 2014-09-06 | 4 | -16/+21 |
| | | | | | This fixes <"SQLite3::SQLException: no such column: legacy_things.person_id: SELECT \"legacy_things\".* FROM \"legacy_things\" WHERE \"legacy_things\".\"person_id\" = ?"> in OptimisticLockingTest#test_lock_destroy | ||||
* | Merge pull request #16824 from rajcybage/action_view_content_tag | Jeremy Kemper | 2014-09-06 | 2 | -1/+1 |
|\ | | | | | fix the undefined method content_tag #15245 | ||||
| * | fix the undefined method content_tag #15245 | Rajarshi Das | 2014-09-06 | 2 | -1/+1 |
| | | | | | | | | not required include ActionView::Helpers::TagHelper in test as well | ||||
* | | Merge pull request #16822 from ↵ | Jeremy Kemper | 2014-09-06 | 3 | -5/+43 |
|\ \ | |/ |/| | | | | | jeremy/deprecate-problematic-implicit-response-splatting Deprecate implicit AD::Response splatting and Array conversion | ||||
| * | Deprecate implicit AD::Response splatting and Array conversion | Jeremy Kemper | 2014-09-06 | 3 | -5/+43 |
| | | |||||
* | | Dependencies: bump to jquery-rails 4.0.0.beta2 | Godfrey Chan | 2014-09-05 | 2 | -2/+2 |
| | | |||||
* | | Use the released jquery-rails gem | Godfrey Chan | 2014-09-05 | 2 | -3/+9 |
| | | |||||
* | | Add TODO to release the gems before the next Rails release | Rafael Mendonça França | 2014-09-05 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #16114 from seuros/test_clean | Rafael Mendonça França | 2014-09-05 | 7 | -26/+25 |
|\ \ | | | | | | | [Postgresql tests] Added enable_extension! to helper | ||||
| * | | Added enable_extension! to helper | Abdelkader Boudih | 2014-09-05 | 7 | -26/+25 |
| | | | |||||
* | | | Remove CHANGELOG entry [ci skip] | Rafael Mendonça França | 2014-09-05 | 1 | -8/+0 |
| | | | |||||
* | | | Do not mark object as persisted after an association is saved | Rafael Mendonça França | 2014-09-05 | 3 | -21/+14 |
| |/ |/| | | | | | | | | | | | | | | | | | | | Callback order in Active Record objects are important. Users should not define callbacks before the association definition or surprising behaviours like the described at #3798 will happen. This callback order dependency is documented at https://github.com/rails/rails/blob/31bfcdc77ca0d8cec9b5fe513bdc6f05814dd4f1/activerecord/lib/active_record/associations.rb#L1222-1227. This reverts #15728. Fixes #16620. | ||||
* | | :scissors: | Rafael Mendonça França | 2014-09-05 | 1 | -1/+1 |
| | | |||||
* | | Add test to assert_recognizes with custom message | Rafael Mendonça França | 2014-09-05 | 1 | -1/+9 |
| | | |||||
* | | Message doesn't need to be optional | Rafael Mendonça França | 2014-09-05 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #14911 from estsauver/14908 | Rafael Mendonça França | 2014-09-05 | 2 | -7/+15 |
|\ \ | | | | | | | | | | Propagate test messages through assert_routing helper, Fixes #14908 | ||||
| * | | Propagate test messages through assert_routing helper, Fixes #14908 | Earl St Sauver | 2014-04-29 | 2 | -7/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assert_routing was not raising the message passed into the assertion violation that it raised. This change propagates messages through the on_fail error. This fixes this error: https://github.com/rails/rails/issues/14908 A test case for this issue is located here. https://github.com/estsauver/test14908 To see that test case fail in the example app, just run ruby -Itest test/controllers/guests_controller_test.rb | ||||
* | | | Fix for inflector's incorrect camelCase replacement for acronyms | Matthew Draper | 2014-09-06 | 4 | -1/+10 |
| | | | | | | | | | | | | | | | | | | Fixes #8015, #9756. [Fred Wu & Matthew Draper] | ||||
* | | | Merge pull request #16818 from phoet/patch-4 | Rafael Mendonça França | 2014-09-05 | 1 | -1/+2 |
|\ \ \ | |_|/ |/| | | world writable might be a bit too open... | ||||
| * | | world writable might be a bit too open... | Peter Schröder | 2014-09-05 | 1 | -1/+2 |
|/ / | |||||
* | | For now, we will keep sorting the tests. | Matthew Draper | 2014-09-05 | 4 | -4/+7 |
| | | | | | | | | | | This reverts commits e969c928463e329fd6529ac59cad96385c538ffb and bd2b3fbe54e750ba97469a7896e8d143d6dfd465. | ||||
* | | Merge pull request #16815 from seuros/ar-freeze-adapter-name | Santiago Pastorino | 2014-09-05 | 6 | -17/+6 |
|\ \ | | | | | | | Freeze ADAPTER_NAME in adapters | ||||
| * | | Freeze ADAPTER_NAME in adapters | Abdelkader Boudih | 2014-09-05 | 6 | -17/+6 |
|/ / | |||||
* | | Fixed regression with referencing polymorphic assoc in eager-load | Godfrey Chan | 2014-09-05 | 3 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is cased by 03118bc + 9b5d603. The first commit referenced the undefined local variable `column` when it should be using `reflection.type` as the lookup key. The second commit changed `build_arel` to not modify the `bind_values` in- place so we need to combine the arel's `bind_values` with the relation's when building the SQL. Fixes #16591 Related #15821 / #15892 / 7aeca50 | ||||
* | | Merge pull request #16807 from tgxworld/carry_out_assignment_within_block | Yves Senn | 2014-09-05 | 1 | -8/+16 |
|\ \ | | | | | | | Move variable assignment within logging block. | ||||
| * | | Move variable assignment within logging block. | Guo Xiang Tan | 2014-09-05 | 1 | -8/+16 |
| | | | |||||
* | | | Merge pull request #16765 from Agis-/time-change-bug | Andrew White | 2014-09-05 | 3 | -0/+7 |
|\ \ \ | | | | | | | | | Time#change throws exception with an out-of-range :usec | ||||
| * | | | Time#change throws exception with an out-of-range :usec | Agis- | 2014-09-04 | 3 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/98b46bf5e201307cae56ee14bf41363a539779c5 did not properly handled out-of-range `:usec`s. Passing a `:usec` that's out of range now throws an `ArgumentError` as it should. Fixes #16759. | ||||
* | | | | Merge pull request #16813 from seuros/rdoc | Zachary Scott | 2014-09-04 | 1 | -14/+14 |
|\ \ \ \ | | | | | | | | | | | Fix ActiveJob rdoc `enqueue` -> `perform_later` [ci skip] | ||||
| * | | | | correct rdoc [ci skip] | Abdelkader Boudih | 2014-09-05 | 1 | -14/+14 |
|/ / / / | |||||
* | | | | Merge pull request #16809 from akshay-vishnoi/for_not_to_do_not | Guillermo Iguaran | 2014-09-04 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Cover all cases of `For not` --> `Do not`, related to #16804 | ||||
| * | | | cover all cases of `For not` --> `Do not`, related to #16804 | Akshay Vishnoi | 2014-09-05 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #16699 from cristianbica/aj-refactor-queueing | David Heinemeier Hansson | 2014-09-04 | 33 | -265/+447 |
|\ \ \ | | | | | | | | | Active Job partial refactor | ||||
| * | | | Rename remaining :in / :at to :wait / :wait_until | Cristian Bica | 2014-09-04 | 4 | -25/+22 |
| | | | | |||||
| * | | | Active Job refactoring | Cristian Bica | 2014-09-03 | 33 | -256/+441 |
| | | | | |||||
* | | | | Load :developers fixtures where expecting a Developer to be there | Akira Matsuda | 2014-09-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #16788 from codeodor/fix-16761 | Aaron Patterson | 2014-09-04 | 6 | -3/+34 |
|\ \ \ \ | | | | | | | | | | | Skip StatementCache for eager loaded associations | ||||
| * | | | | Skip StatementCache for eager loaded associations (Fixes #16761) | Sammy Larbi | 2014-09-04 | 6 | -3/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eagerly loaded collection and singular associations are ignored by the StatementCache, which causes errors when the queries they generate reference columns that were not eagerly loaded. This commit skips the creation of the StatementCache as a fix for these scenarios. | ||||
* | | | | | always reorder bind parameters. fixes #15920 | Aaron Patterson | 2014-09-04 | 2 | -7/+12 |
| | | | | | |||||
* | | | | | :scissors: and from #16803 [ci skip] | Zachary Scott | 2014-09-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #16803 from Peeja/methods-are-not-duplicable--update-guide | Zachary Scott | 2014-09-04 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Document that method objects are not `duplicable?` [ci skip] | ||||
| * | | | | | Document that method objects are not `duplicable?` | Peter Jaros | 2014-09-04 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #16804 from kaleworsley/for_not_to_do_not | Rafael Mendonça França | 2014-09-04 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Change "For not..." to "Do not...". | ||||
| * | | | | Change "For not..." to "Do not...". | Kale Worsley | 2014-09-04 | 1 | -1/+1 |
|/ / / / | |||||
* / / / | Remove example file | Rafael Mendonça França | 2014-09-04 | 1 | -30/+0 |
|/ / / | | | | | | | | | | | | | | | | This documentation should be in the guides. Closes #16691 | ||||
* | | | Merge pull request #16801 from ↵ | Rafael Mendonça França | 2014-09-04 | 2 | -7/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | eileencodes/refactor-scope_chain-on-through-refelction-to-eliminate-branch-in-eval_scope Always add lambda to scope chain to eliminate branch in eval_scope | ||||
| * | | | Always add lambda to scope chain to eliminate branch in eval_scope | eileencodes | 2014-09-04 | 2 | -7/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | We convert all other scopes to lambda's so it makes sense that we should always returns a lambda on a ThroughReflection as well. This eliminates the need to check if the scope is a Relation. | ||||
* | | | | Fix a warning | Matthew Draper | 2014-09-05 | 1 | -1/+1 |
| | | | |