Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
* | | | Merge pull request #16797 from ↵ | Matthew Draper | 2014-09-04 | 1 | -4/+4 |
|\ \ \ | |/ / |/| | | | | | | | | eileencodes/refactor-add_constraints-followup-to-16762 Followup to PR #16762 | ||||
| * | | Follup to PR #16762 | eileencodes | 2014-09-04 | 1 | -4/+4 |
|/ / | | | | | | | | | | | | | | | Remove chain from parameters, it's no longer needed since chain and i are being passed via next_reflection Change name of `reflection` to `owner_reflection` because of shadow variable warning. The last reflection will always be the owner. | ||||
* | | Merge pull request #16799 from rramsden/fix-typo | Yves Senn | 2014-09-04 | 1 | -1/+1 |
|\ \ | | | | | | | [ci skip] Fix typo in rails guide for routing | ||||
| * | | [ci skip] Fix typo in rails guide for routing | Richard Ramsden | 2014-09-04 | 1 | -1/+1 |
| | | | |||||
* | | | Enums shouldn't ruin people's anniversaries | Godfrey Chan | 2014-09-04 | 3 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | Added a few more methods on Module/Class to the dangerous class methods blacklist. (Technically, allocate and new are already protected currently because we happen to redefine them in the current implantation.) Closes #16792 | ||||
* | | | build fix, we have to reset the RACK_ENV as well. | Yves Senn | 2014-09-04 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | This is a follow-up to ded17a4 to get the build passing on Travis. As Travis has `ENV["RACK_ENV"]` set to `test` we need to reset that as well. | ||||
* | | | get rid of shadowing warning when running tests AR and railtie tests. | Yves Senn | 2014-09-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Warning looked like this: ``` /Users/senny/Projects/rails/activerecord/lib/active_record/associations/association_scope.rb:142: warning: shadowing outer local variable - reflection ``` | ||||
* | | | code gardening in ActionController::Renderers | Xavier Noria | 2014-09-04 | 1 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Renames _handle_render_options to _render_to_body_with_renderer, which is more intention-revealing. * The name of the dynamically generated method for a renderer with key :js was "_render_option_js". That name is too weak. :js is an option if you see the render argument as just a generic options hash, but in the context of renderers that's the renderer key, is what identifies the renderer. Now "_render_with_renderer_js" is generated instead, which is crystal clear. * The name of the dynamically generated method for the renderer was constructed using string literals in a few places. That is now encapsulated in a method. * Since we were on it, also removed a couple of redundant selfs. | ||||
* | | | Extract data/aria attribute prefixes to a constant | Rafael Mendonça França | 2014-09-03 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #16796 from ARIATeam/aria | Rafael Mendonça França | 2014-09-03 | 3 | -4/+23 |
|\ \ \ | | | | | | | | | Add support for ARIA attributes in tags | ||||
| * | | | Add support for ARIA attributes in tags | PaoMar | 2014-09-03 | 3 | -4/+23 |
|/ / / | |||||
* | | | Merge pull request #16795 from Peeja/methods-are-not-duplicable | Rafael Mendonça França | 2014-09-03 | 3 | -1/+16 |
|\ \ \ | | | | | | | | | Methods are not duplicable. | ||||
| * | | | Methods are not duplicable. | Peter Jaros | 2014-09-03 | 3 | -1/+16 |
| | | | | |||||
* | | | | Merge pull request #16787 from cristianbica/fix-globalid-deserialization | Matthew Draper | 2014-09-04 | 1 | -1/+3 |
|\ \ \ \ | |_|_|/ |/| | | | [Active Job] Try to deserialize with GlobalID only strings and globalids | ||||
| * | | | [Active Job] Try to deserialize with GlobalID only strings and globalids | Cristian Bica | 2014-09-03 | 1 | -1/+3 |
| | | | | |||||
* | | | | 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 |
| | | | | | |