aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added enable_extension! to helperAbdelkader Boudih2014-09-057-26/+25
|
* For now, we will keep sorting the tests.Matthew Draper2014-09-054-4/+7
| | | | | This reverts commits e969c928463e329fd6529ac59cad96385c538ffb and bd2b3fbe54e750ba97469a7896e8d143d6dfd465.
* Merge pull request #16815 from seuros/ar-freeze-adapter-nameSantiago Pastorino2014-09-056-17/+6
|\ | | | | Freeze ADAPTER_NAME in adapters
| * Freeze ADAPTER_NAME in adaptersAbdelkader Boudih2014-09-056-17/+6
|/
* Fixed regression with referencing polymorphic assoc in eager-loadGodfrey Chan2014-09-053-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_blockYves Senn2014-09-051-8/+16
|\ | | | | Move variable assignment within logging block.
| * Move variable assignment within logging block.Guo Xiang Tan2014-09-051-8/+16
| |
* | Merge pull request #16765 from Agis-/time-change-bugAndrew White2014-09-053-0/+7
|\ \ | | | | | | Time#change throws exception with an out-of-range :usec
| * | Time#change throws exception with an out-of-range :usecAgis-2014-09-043-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/rdocZachary Scott2014-09-041-14/+14
|\ \ \ | | | | | | | | Fix ActiveJob rdoc `enqueue` -> `perform_later` [ci skip]
| * | | correct rdoc [ci skip]Abdelkader Boudih2014-09-051-14/+14
|/ / /
* | | Merge pull request #16809 from akshay-vishnoi/for_not_to_do_notGuillermo Iguaran2014-09-041-1/+1
|\ \ \ | |_|/ |/| | Cover all cases of `For not` --> `Do not`, related to #16804
| * | cover all cases of `For not` --> `Do not`, related to #16804Akshay Vishnoi2014-09-051-1/+1
|/ /
* | Merge pull request #16699 from cristianbica/aj-refactor-queueingDavid Heinemeier Hansson2014-09-0433-265/+447
|\ \ | | | | | | Active Job partial refactor
| * | Rename remaining :in / :at to :wait / :wait_untilCristian Bica2014-09-044-25/+22
| | |
| * | Active Job refactoringCristian Bica2014-09-0333-256/+441
| | |
* | | Load :developers fixtures where expecting a Developer to be thereAkira Matsuda2014-09-051-1/+1
| | |
* | | Merge pull request #16788 from codeodor/fix-16761Aaron Patterson2014-09-046-3/+34
|\ \ \ | | | | | | | | Skip StatementCache for eager loaded associations
| * | | Skip StatementCache for eager loaded associations (Fixes #16761)Sammy Larbi2014-09-046-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 #15920Aaron Patterson2014-09-042-7/+12
| | | |
* | | | :scissors: and from #16803 [ci skip]Zachary Scott2014-09-041-1/+1
| | | |
* | | | Merge pull request #16803 from Peeja/methods-are-not-duplicable--update-guideZachary Scott2014-09-041-1/+1
|\ \ \ \ | | | | | | | | | | Document that method objects are not `duplicable?` [ci skip]
| * | | | Document that method objects are not `duplicable?`Peter Jaros2014-09-041-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #16804 from kaleworsley/for_not_to_do_notRafael Mendonça França2014-09-041-1/+1
|\ \ \ \ | |/ / / |/| | | Change "For not..." to "Do not...".
| * | | Change "For not..." to "Do not...".Kale Worsley2014-09-041-1/+1
|/ / /
* / / Remove example fileRafael Mendonça França2014-09-041-30/+0
|/ / | | | | | | | | | | This documentation should be in the guides. Closes #16691
* | Merge pull request #16801 from ↵Rafael Mendonça França2014-09-042-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_scopeeileencodes2014-09-042-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 warningMatthew Draper2014-09-051-1/+1
| | |
* | | Merge pull request #16797 from ↵Matthew Draper2014-09-041-4/+4
|\ \ \ | |/ / |/| | | | | | | | eileencodes/refactor-add_constraints-followup-to-16762 Followup to PR #16762
| * | Follup to PR #16762eileencodes2014-09-041-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-typoYves Senn2014-09-041-1/+1
|\ \ | | | | | | [ci skip] Fix typo in rails guide for routing
| * | [ci skip] Fix typo in rails guide for routingRichard Ramsden2014-09-041-1/+1
| | |
* | | Enums shouldn't ruin people's anniversariesGodfrey Chan2014-09-043-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 Senn2014-09-041-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 Senn2014-09-041-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::RenderersXavier Noria2014-09-041-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 constantRafael Mendonça França2014-09-031-1/+3
| | |
* | | Merge pull request #16796 from ARIATeam/ariaRafael Mendonça França2014-09-033-4/+23
|\ \ \ | | | | | | | | Add support for ARIA attributes in tags
| * | | Add support for ARIA attributes in tagsPaoMar2014-09-033-4/+23
|/ / /
* | | Merge pull request #16795 from Peeja/methods-are-not-duplicableRafael Mendonça França2014-09-033-1/+16
|\ \ \ | | | | | | | | Methods are not duplicable.
| * | | Methods are not duplicable.Peter Jaros2014-09-033-1/+16
| | | |
* | | | Merge pull request #16787 from cristianbica/fix-globalid-deserializationMatthew Draper2014-09-041-1/+3
|\ \ \ \ | |_|_|/ |/| | | [Active Job] Try to deserialize with GlobalID only strings and globalids
| * | | [Active Job] Try to deserialize with GlobalID only strings and globalidsCristian Bica2014-09-031-1/+3
| | | |
* | | | Merge pull request #16775 from kaspth/ship-secure-sanitizerRafael Mendonça França2014-09-036-53/+8
|\ \ \ \ | |_|/ / |/| | | Ship with rails-html-sanitizer instead.
| * | | Ship with rails-html-sanitizer instead.Kasper Timm Hansen2014-09-036-53/+8
| | | |
* | | | Merge pull request #16756 from huoxito/dont-mess-railties-default-orderRafael Mendonça França2014-09-032-8/+45
|\ \ \ \ | | | | | | | | | | Dont mess with default order engines load (4.1.6.rc1 regression)
| * | | | Dont mess with default order engines loadWashington Luiz2014-09-022-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 laterAaron Patterson2014-09-031-1/+5
| | | | |
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-09-036-17/+247
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-19 18:04:25 +0000