4d8523c382
Merge pull request #16699 from cristianbica/aj-refactor-queueing
...
Active Job partial refactor
2014-09-04 18:50:28 -07:00
312e4cda78
Load :developers fixtures where expecting a Developer to be there
2014-09-05 09:50:49 +09:00
ed7c851c4b
Merge pull request #16788 from codeodor/fix-16761
...
Skip StatementCache for eager loaded associations
2014-09-04 17:24:34 -07:00
2e6625fb77
always reorder bind parameters. fixes #15920
2014-09-04 14:40:19 -07:00
c523b7c468
✂️ and from #16803 [ci skip]
2014-09-04 14:19:47 -07:00
67463d5adc
Merge pull request #16803 from Peeja/methods-are-not-duplicable--update-guide
...
Document that method objects are not `duplicable?` [ci skip]
2014-09-04 14:19:11 -07:00
181d4f21bf
Merge pull request #16804 from kaleworsley/for_not_to_do_not
...
Change "For not..." to "Do not...".
2014-09-04 18:12:17 -03:00
39fc362b9b
Change "For not..." to "Do not...".
2014-09-04 15:08:36 -06:00
b947b6eca5
Document that method objects are not `duplicable?`
2014-09-04 15:09:07 -04:00
703a2e8da1
Remove example file
...
This documentation should be in the guides.
Closes #16691
2014-09-04 14:06:40 -03:00
4abbdbdf16
Skip StatementCache for eager loaded associations ( Fixes #16761 )
...
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.
2014-09-04 10:05:01 -05:00
40f9407b87
Merge pull request #16801 from 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
2014-09-04 11:54:59 -03:00
2198a9fc0d
Fix a warning
2014-09-05 00:05:37 +09:30
0b6358beb4
Always add lambda to scope chain to eliminate branch in eval_scope
...
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.
2014-09-04 08:16:13 -04:00
4c23701d3d
Merge pull request #16797 from eileencodes/refactor-add_constraints-followup-to-16762
...
Followup to PR #16762
2014-09-04 21:33:40 +09:30
8dac515688
Follup to PR #16762
...
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.
2014-09-04 07:52:19 -04:00
b8fbcc0787
Merge pull request #16799 from rramsden/fix-typo
...
[ci skip] Fix typo in rails guide for routing
2014-09-04 10:27:49 +02:00
94b7328b08
Enums shouldn't ruin people's anniversaries
...
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
2014-09-04 00:34:21 -07:00
316962d092
build fix, we have to reset the RACK_ENV as well.
...
This is a follow-up to ded17a4
2014-09-04 07:54:30 +02:00
9831875012
get rid of shadowing warning when running tests AR and railtie tests.
...
Warning looked like this:
```
/Users/senny/Projects/rails/activerecord/lib/active_record/associations/association_scope.rb:142: warning: shadowing outer local variable - reflection
```
2014-09-04 07:52:08 +02:00
633f72cf0c
[ci skip] Fix typo in rails guide for routing
2014-09-04 14:45:08 +09:00
15ddf60e05
Rename remaining :in / :at to :wait / :wait_until
2014-09-04 08:08:06 +03:00
4dfe140ef3
code gardening in ActionController::Renderers
...
* 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.
2014-09-04 00:45:01 +02:00
faa0f32434
Extract data/aria attribute prefixes to a constant
2014-09-03 18:31:04 -03:00
a794fd2c0a
Merge pull request #16796 from ARIATeam/aria
...
Add support for ARIA attributes in tags
2014-09-03 18:18:05 -03:00
ee61b76a81
Add support for ARIA attributes in tags
2014-09-03 16:14:21 -05:00
b79ab4ca95
Merge pull request #16795 from Peeja/methods-are-not-duplicable
...
Methods are not duplicable.
2014-09-03 17:11:24 -03:00
fdc5e768ca
Methods are not duplicable.
2014-09-03 16:09:15 -04:00
d4cc941d16
Merge pull request #16787 from cristianbica/fix-globalid-deserialization
...
[Active Job] Try to deserialize with GlobalID only strings and globalids
2014-09-04 05:33:39 +09:30
1e237b4e44
Active Job refactoring
2014-09-03 23:01:46 +03:00
5db4e7f0ec
Merge pull request #16775 from kaspth/ship-secure-sanitizer
...
Ship with rails-html-sanitizer instead.
2014-09-03 16:59:58 -03:00
66c9d31c2b
Merge pull request #16756 from huoxito/dont-mess-railties-default-order
...
Dont mess with default order engines load (4.1.6.rc1 regression)
2014-09-03 16:28:33 -03:00
0942100ce1
extract updating all fixture cache to a method so we can lock later
2014-09-03 12:09:21 -07:00
28eecd934b
Ship with rails-html-sanitizer instead.
2014-09-03 20:27:59 +02:00
1fc2e70495
Merge branch 'master' of github.com:rails/docrails
2014-09-03 16:14:10 +00:00
077d28fb66
copy edit AS core ext changes [ci skip]
2014-09-03 16:12:45 +00:00
ded17a498a
schema loading rake tasks maintain database connection for current env.
...
[Joshua Cody & Yves Senn]
Closes #16757 .
Prior to this patch schema loading rake tasks had the potential to leak a
connection to a different database. This had side-effects when rake tasks
operating on the current connection (like `db:seed`) were chained.
2014-09-03 18:02:44 +02:00
57d56aa933
[Active Job] Try to deserialize with GlobalID only strings and globalids
2014-09-03 15:06:10 +03:00
e2ce4c7aa3
Merge pull request #16785 from cristianbica/fix-double-aj-deserialization-error
...
Fix for double ActiveJob::DeserializationErorr
2014-09-03 20:56:25 +09:30
56f992fe15
Fix for double ActiveJob::DeserializationErorr
2014-09-03 14:23:47 +03:00
a4de217ce5
Merge pull request #16263 from zuhao/refactor_activerecord_serialized_attribute_test
...
reset_column_infomation shouldn't be part of the assertion.
2014-09-03 12:04:38 +02:00
f6d3af4fa7
Merge pull request #16780 from viditn91/use-correct-operators-in-query
...
use correct operator in query based on JSON document [ci skip]
2014-09-03 08:59:52 +02:00
ea1a02878c
Merge pull request #16781 from kamipo/move_column_option_handling
...
Move column option handling to new_column_definition
2014-09-03 08:55:15 +02:00
3cce7628e4
Reset ActiveRecord::SchemaDumper.ignore_tables value after changed in tests
2014-09-03 11:30:36 +09:00
435e8d719c
Dont mess with default order engines load
...
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`
2014-09-02 22:50:50 -03:00
f6767b962e
Move column option handling to new_column_definition
...
TableDefinition#column is not called from `add_column`.
Use TableDefinition#new_column_definition for column option handling.
2014-09-03 06:01:48 +09:00
6d988e2a29
use correct operator in query based on JSON document
2014-09-03 02:31:00 +05:30
268a55f5ef
Merge pull request #16777 from seuros/testcase
...
Fix failing tests in ActiveJob Adapter
2014-09-03 06:18:51 +09:30
5ddbaea534
Merge pull request #16778 from yahonda/if_exists
...
Remove 'if exists' from drop table statement then use `table_exists?`
2014-09-02 17:43:29 -03:00
a70bdfe6e3
Fix failing tests in ActiveJob Adapter
2014-09-02 20:27:32 +00:00
David Heinemeier Hansson