Jon Leighton
55193e449a
Apply default scope when joining associations.
...
For example:
class Post < ActiveRecord::Base
default_scope -> { where published: true }
end
class Comment
belongs_to :post
end
When calling `Comment.join(:post)`, we expect to receive only
comments on published posts, since that is the default scope for
posts.
Before this change, the default scope from `Post` was not applied,
so we'd get comments on unpublished posts.
2013-06-28 11:47:00 +01:00
Jon Leighton
4642f5487a
Fix test
...
Oops. We need to estalish/remove the connection in the setup/teardown,
else it messes with the fixtures.
2013-06-28 11:46:03 +01:00
Jon Leighton
cb8c950333
Fix rake test_sqlite3_mem
...
Clearly nobody uses this except me. It's fast people!
2013-06-28 11:37:42 +01:00
Jon Leighton
2ea7183799
Merge pull request #11153 from strzalek/remove-ar-deprecated-finders
...
Remove depreacted finders
2013-06-28 02:13:06 -07:00
Akira Matsuda
569227b091
Fix indentation
2013-06-28 16:39:43 +09:00
Carlos Antonio da Silva
9a26d94d60
Merge pull request #11150 from jetthoughts/remove_depr_message_for_attribute_method_matcher
...
Remove deprecation warning from AttributeMethodsMatcher
2013-06-27 17:48:14 -07:00
Łukasz Strzałkowski
3cc7223f3d
Remove depreacted finders
...
They were deprecated in 4.0, planned to remove in 4.1
2013-06-28 00:24:11 +02:00
Paul Nikitochkin
e63ba910ae
Remove deprecation warning from AttributeMethodsMatcher
2013-06-28 00:16:42 +03:00
Yves Senn
ca81874b3b
Merge pull request #11127 from jetthoughts/ask_user_add_line_to_routes_in_guide
...
Asking user to declare post resource in getting start guide
2013-06-27 12:24:07 -07:00
Paul Nikitochkin
9d9b4b5116
Asking user to declare post resource in guide [ci skip]
2013-06-27 22:21:29 +03:00
Carlos Antonio da Silva
6d7477e87d
Merge pull request #11149 from strzalek/remove-protected-attrs
...
Remove deprecated attr_protected/accessible
2013-06-27 11:42:52 -07:00
Carlos Antonio da Silva
e16ad2db8c
Review AV changelog [ci skip]
2013-06-27 15:39:17 -03:00
Łukasz Strzałkowski
468939297d
Remove deprecated attr_protected/accessible
...
Rails 4.0 has removed attr_protected and attr_accessible feature in favor of Strong Parameters.
2013-06-27 20:38:30 +02:00
Carlos Antonio da Silva
2f7253c6e9
Merge pull request #11147 from kennyj/remove_prompt_argument_was_deprecated
...
Remove passing the prompt to grouped_options_for_select as an argument, because it was deprecated.
2013-06-27 11:32:14 -07:00
kennyj
94c72c45bb
Remove passing the prompt to grouped_options_for_select as an argument, because it was deprecated.
2013-06-28 03:11:00 +09:00
Yves Senn
4f1a7dc956
Merge pull request #11141 from keydunov/master
...
Fix documentation for grouped_collection_select
2013-06-27 11:09:00 -07:00
Rafael Mendonça França
90f00142e6
Merge pull request #11146 from kennyj/re-remove-deprecated-api
...
Re-remove deprecated API.
2013-06-27 10:21:26 -07:00
Rafael Mendonça França
463c08d1c2
Merge pull request #11145 from JeffreyRodriguez/rails_4_root_directive_updates_and_fixes
...
Removed "to:" from root directive and fixed typo ":to"
2013-06-27 09:55:46 -07:00
kennyj
db0499a6b6
Re-remove deprecated API.
2013-06-28 01:42:07 +09:00
Jeff Rodriguez
d4dca25d9d
Removed "to:" from root directive and fixed typo ":to"
...
`root :to` is invalid syntax
`root to:` is valid, but the generated routes file omits `to:`
2013-06-27 09:18:08 -07:00
Guillermo Iguaran
34127787bb
Merge pull request #11144 from kennyj/fix_copyright_year
...
Fix copyright year for actionview [ci skip]
2013-06-27 09:09:54 -07:00
kennyj
77cb37cc74
Fix copyright year for actionview [ci skip]
2013-06-28 01:05:08 +09:00
Artyom
2137f8842b
Fix documentation for grouped_collection_select [ci skip]
2013-06-27 19:52:37 +04:00
Akira Matsuda
b22cbf8267
Fix punctuation in config templates
2013-06-28 00:43:02 +09:00
Rafael Mendonça França
98c36ba19c
Merge pull request #11142 from tumayun/use_master_branch_activesupport
...
activerecord/examples/simple.rb use master branch activesupport gem
2013-06-27 08:26:23 -07:00
tumayun
e82f206a94
activerecord/examples/simple.rb use master branch activesupport gem
2013-06-27 23:17:34 +08:00
Yves Senn
995b4cfcaa
Merge pull request #11139 from prathamesh-sonpatki/grammar
...
fix grammar, change 'an' to 'a' [ci skip]
2013-06-27 05:22:00 -07:00
Prathamesh Sonpatki
ea1790c2ef
fix grammar, change 'an' to 'a' [ci skip]
2013-06-27 17:51:04 +05:30
Carlos Antonio da Silva
48ab2c06e0
Merge pull request #11054 from senny/11048_make_default_value_explicit
...
make default value for `:message` on `AM::Errors` explicit.
2013-06-27 05:16:38 -07:00
Yves Senn
666ca163e0
Merge pull request #11133 from wangjohn/remove_deprecation_rake_task
...
Removing deprecation message and silencing method.
2013-06-27 04:53:26 -07:00
Yves Senn
3dcc0b7afc
Merge pull request #11136 from prathamesh-sonpatki/rails4
...
Use activerecord 4.0.0 for reporting bugs using the template
2013-06-27 01:25:40 -07:00
Steve Klabnik
0a1591d51f
Merge pull request #11137 from WvanLelyveld/master
...
There was a parenthesis in the guides, which resulted in the one link not working, and a second link not even showing. [ci skip]
2013-06-27 01:09:56 -07:00
Wouter van Lelyveld
8c0fc98214
Fixing links to accept_language plugin/middleware
2013-06-27 09:18:52 +02:00
Prathamesh Sonpatki
2a7882f0fd
Use activerecord 4.0.0 for reporting bugs using the template[ci skip]
2013-06-27 12:26:58 +05:30
wangjohn
8f1deaeb37
Removing deprecation message and silencing method.
...
The deprecation rake task is no longer useful because the deprecated
methods have already been removed.
The method for silencing stderr has been removed since it was only
useful for `rake test:uncommitted` which was deprecated and removed.
2013-06-26 22:19:02 -07:00
Carlos Antonio da Silva
f5df6e5a6d
Review railties changelog [ci skip]
2013-06-26 20:17:58 -03:00
Carlos Antonio da Silva
bbbedeeb89
Move delegation error constant to inside Module
2013-06-26 20:17:58 -03:00
Santiago Pastorino
b49405f1a2
Merge pull request #11124 from wangjohn/removing_deprecated_rake_tasks
...
Removing deprecated rake tasks for tests
2013-06-26 14:19:56 -07:00
Yves Senn
cf4270e16b
Merge pull request #11128 from edg3r/patch-1
...
linking small rails 4 features image to a bigger one
2013-06-26 13:25:40 -07:00
Yves Senn
3f50dd21c1
Merge pull request #10828 from southpolesteve/delegation_error_class
...
Create DelegationError class
2013-06-26 13:20:26 -07:00
R4K3
6056356159
linking small rails 4 features image to a bigger one [ci skip]
...
View a bigger version onclick
https://github.com/rails/rails/issues/11100
2013-06-27 00:15:04 +04:00
Steve Faulkner
8139d727c5
Add DelegationError class. Rasied by delegation to a nil object
2013-06-26 15:12:54 -05:00
Yves Senn
577fad1908
mention the removal of --builder
in 4.0 release notes.
2013-06-26 22:02:07 +02:00
Rafael Mendonça França
9dfa926874
Merge pull request #11126 from tumayun/fix_activerecord_examples_performance_rb_syntax_error
...
fix activerecord/examples/performance.rb#L101 syntax error
2013-06-26 11:12:09 -07:00
tumayun
f6f373db9b
fix activerecord/examples/performance.rb#L101 syntax error
2013-06-27 01:49:54 +08:00
Vijay Dev
317aaa0588
Merge branch 'master' of github.com:lifo/docrails
...
Conflicts:
guides/source/layout.html.erb
2013-06-26 22:57:34 +05:30
Robin Dupret
73b13f7dc9
Remove a comment related to 920753f
...
Since 920753f, double assignment isn't used anymore
2013-06-26 14:33:18 +02:00
Carlos Antonio da Silva
342de058c4
Merge pull request #11112 from arunagw/rakefile_changes
...
Minor changes to actionpack/actionview Rakefile
2013-06-26 04:37:15 -07:00
Yves Senn
d9a0e0d853
remove trailing whitespace from config/routes.rb
template.
2013-06-26 12:06:55 +02:00
Arun Agrawal
c4f588213b
Minor changes to actionpack/actionview Rakefile
2013-06-26 10:22:10 +02:00