Rafael Mendonça França
efbbb30534
Merge pull request #18049 from yuki3738/fix_rails_db_command_error
...
Add a code checking about file or not to the rails db command
2014-12-16 15:12:21 -02:00
Rafael Mendonça França
3bdd110dfe
Merge pull request #18052 from timoschilling/reset_variants
...
allow reseting of request variants
2014-12-16 15:06:01 -02:00
Rafael Mendonça França
a328014ff2
Merge pull request #18032 from claudiob/add-test-for-after-validate-callbacks
...
Add test for ActiveModel `after_validation`, `after_` and `around_` callbacks returning false
2014-12-16 14:50:05 -02:00
Rafael Mendonça França
1f5df859d8
Merge pull request #18054 from jonatack/add_content_tag_test
...
Test to ensure content_tag works when fixing #17661
2014-12-16 14:47:54 -02:00
Rafael Mendonça França
43ab5433a7
Merge pull request #18031 from claudiob/better-tests-for-callbacks-terminator
...
Add test for `:skip_after_callbacks_if_terminated`
2014-12-16 14:46:34 -02:00
Jon Atack
2038c2c53d
Test to ensure content_tag works when fixing #17661
...
After c2fe093, which was reverted yesterday, there will likely be
future PRs to address #17661 .
The test `actionview/test/template/capture_helper_test.rb
#test_capture_returns_nil_if_the_returned_value_is_not_a_string` should
have errored with c2fe093, but it was rewritten in the PR to not raise.
My guess is that it may have seemed irrelevant to the content_tag tests
or already covered by them.
This test provides additional protection by being in the content_tag
test suite to explicitly raise a red flag in future cases. It foregoes
some redundancy for safety — at least until #17661 is closed.
2014-12-16 17:37:26 +01:00
Xavier Noria
ab90c277a7
Merge pull request #18050 from jonatack/patch-13
...
Improve section in constant autoload guide
2014-12-16 16:39:20 +01:00
Rafael Mendonça França
e12be48774
Merge pull request #18036 from claudiob/remove-redundant-tests-about-around-actions-returning-false
...
Remove misleading test: around_action return false
2014-12-16 13:31:57 -02:00
Arthur Nogueira Neves
f26c955b9a
Merge pull request #18053 from georgemillo/patch-2
...
English fix [ci skip]
2014-12-16 09:46:30 -05:00
George Millo
d75773ada0
English fix [ci skip]
2014-12-16 14:32:06 +00:00
Eileen M. Uchitelle
f5a4ca323d
Merge pull request #18051 from jonatack/patch-14
...
Improve grammar
2014-12-16 08:55:13 -05:00
Jon Atack
1f5c8130c4
Improve grammar
...
[skip ci]
2014-12-16 11:38:53 +01:00
Timo Schilling
e1fb3483d6
allow reseting of request variants
...
The current implementation of `variants=` don't allow a resetting to nil, wich is the default value.
This results in the following code smell:
```ruby
case request.user_agent
when /iPhone/
request.variants = :phone
when /iPad/
request.variants = :ipad
end
```
With the ability to reset variants to nil, it could be:
```ruby
request.variants = case request.user_agent
when /iPhone/
:phone
when /iPad/
:ipad
end
```
2014-12-16 11:37:04 +01:00
Xavier Noria
d9d5e3f331
Merge pull request #18048 from jonatack/patch-8
...
Constant autoload grammar fix
2014-12-16 11:34:43 +01:00
Jon Atack
3aebff160d
Improve section in constant autoload guide
...
[skip ci]
2014-12-16 11:33:50 +01:00
yuki3738
17bb531f82
Add a code checking about file or not to the rails db command
2014-12-16 19:28:00 +09:00
Jon Atack
de75713a73
Constant autoload grammar fix
...
[skip ci]
2014-12-16 11:21:40 +01:00
Yves Senn
41dc7fd650
docs, synchronize CHANGELOG across branches. [ci skip]
2014-12-16 11:00:12 +01:00
Abdelkader Boudih
149a98a6f1
Merge pull request #18047 from JuanitoFatas/patch/constant_autoloading_and_reloading-list-items
...
[ci skip] ✂️ blank lines between list items.
2014-12-16 09:41:21 +00:00
Yves Senn
01de604d77
decribe deprecation cycle from timestamps null: false
to null: true
.
...
[ci skip]
/cc @sgrif @zzak
Conflicts:
activerecord/CHANGELOG.md
2014-12-16 10:38:03 +01:00
Juanito Fatas
d636c6c477
[ci skip] ✂️ blank lines between list items.
2014-12-16 17:29:04 +08:00
Xavier Noria
d95a58c768
undoes a recent merged edit [ci skip]
...
I think "What" is was fine, "The purpose of" assumes the reader knows such thing exists.
"What is" is fine, and also matches the following "What is require_dependency".
2014-12-16 09:47:03 +01:00
Xavier Noria
48542a4844
missing preposition [ci skip]
2014-12-16 09:43:15 +01:00
Xavier Noria
122d93975c
syncs the autoloading guide and undoes some merged changes [ci skip]
2014-12-16 09:16:58 +01:00
Zachary Scott
9dbe896840
Remove this tip, if the previous statement is true.. ie: The reader sees "Rails
...
4.2.0", then they should have no problems hacking with Rails. [ci skip]
If they do, then its a bug and it should be reported.
2014-12-15 19:07:32 -08:00
Zachary Scott
ce03e36f3e
Merge pull request #17992 from andreynering/guides-intallation
...
Improving tips about installation in the guides [ci skip]
2014-12-15 19:06:47 -08:00
Zachary Scott
a0258d5422
Merge branch 'jonatack-patch-8' [ci skip]
2014-12-15 18:44:59 -08:00
Zachary Scott
8365943852
Merge branch 'patch-8' of https://github.com/jonatack/rails into jonatack-patch-8
...
[ci skip]
Conflicts:
guides/source/constant_autoloading_and_reloading.md
2014-12-15 18:44:41 -08:00
Arthur Nogueira Neves
fb390df036
Merge pull request #18046 from stephenminded/counter_cache_docs_fix
...
Counter cache Rails guides fix
2014-12-15 21:40:44 -05:00
Zachary Scott
34914c6fd7
Add CHANGELOG for #18034 [ci skip]
2014-12-15 18:36:02 -08:00
Zachary Scott
7a7f44d1bd
Merge pull request #18034 from andreynering/ar-guides-querying
...
Adding method chaining section on ActiveRecord querying guide [ci skip]
2014-12-15 18:34:07 -08:00
Zachary Scott
8e9685bf72
Ruby will allocate the class as a side-effect, since it is already defined.
...
[ci skip]
2014-12-15 18:31:27 -08:00
Zachary Scott
fa2e5903f7
Merge pull request #18040 from jonatack/patch-11
...
Improve autoload_paths section [ci skip]
2014-12-15 18:30:11 -08:00
Steve Lounsbury
d60556e967
You need to specify the counter_cache option on the has_many side of the association when using a custom counter cache column. This is documented on the has_many association here: http://apidock.com/rails/ActiveRecord/Associations/ClassMethods/has_many [ci skip]
2014-12-16 01:58:19 +00:00
claudiob
8dfa585db2
Remove misleading test: around_action return false
...
When an `around_action` does not `yield`, then the corresponding action is
*never* executed and the `after_` actions are *never* invoked.
The value returned by the `around_action` does not have any impact on this:
an `around_action` can "return" `true`, `false`, or `"pizza"`, but as long
as `yield` is not invoked, the corresponding action and after callbacks are
not executed.
The test suite for `ActionController::Callbacks` currently includes separate
tests to distinguish the cases in which a non-yielding `around_actions` returns
`true` or `false`.
In my opinion, having such tests is misleading, giving the impression that the
returned value might have some sort of impact, while it does not. At least
that's the impression I got when I read those tests.
For completeness, the tests were introduced 7 years ago by @NZKoz in e80fabb.
2014-12-15 16:36:50 -08:00
Abdelkader Boudih
1b9dca54fd
Merge pull request #18043 from claudiob/minor-autoloading-guides-fixes
...
Minor typos/fixes to autoloading guide
2014-12-16 00:13:30 +00:00
claudiob
4b9f129883
Minor typos/fixes to autoloading guide
...
@fxn Great job with the guide, I read it all! Yeah!
Some paragraphs might be restructured, but I'll leave that to you
since you are currently working on it. This commit only includes
some minor typos and commas that in my opinion clarify the reading.
[ci skip]
2014-12-15 16:11:09 -08:00
Santiago Pastorino
ecb26b736e
Regression test for #18024
2014-12-15 21:34:15 -02:00
Santiago Pastorino
e4627edf87
Revert "Re-enable capture'ing non-String values"
...
This reverts commit c2fe0938d7201d4ce0bb2f25e72bf5f70df128af.
2014-12-15 21:20:54 -02:00
Godfrey Chan
488aefe742
Merge pull request #16924 from Sinjo/params-deep-munge-empty-array
...
Don't convert empty arrays to nils when deep munging params
2014-12-15 14:46:32 -08:00
Xavier Noria
485723e87a
autoloading guide: applies some Strunk & White and hyperlinking [ci skip]
2014-12-15 23:09:39 +01:00
Rafael Mendonça França
9bf2d67690
Merge pull request #18041 from andreynering/ar-guides-querying-2
...
Dynamic finders already deprecated [ci skip]
2014-12-15 19:00:24 -02:00
Andrey Nering
1cd8e71d21
Adding method chaining section on ActiveRecord querying guide [ci skip]
2014-12-15 18:38:58 -02:00
Jon Atack
401b4aa956
Update constant_autoloading_and_reloading.md
...
[skip ci]
Follow-up to previous commit
[skip ci]
Fix previous merge
[skip ci]
2014-12-15 20:31:40 +01:00
Jon Atack
5a18406f0f
Improve autoload_paths section
...
[skip ci]
2014-12-15 20:06:12 +01:00
Rafael Mendonça França
72a815c3fd
Merge pull request #18038 from seuros/typofix
...
fix a typo [ci skip]
2014-12-15 16:16:49 -02:00
Vijay Dev
2ed2be1ccc
Merge branch 'master' of github.com:rails/docrails
2014-12-15 18:12:29 +00:00
Abdelkader Boudih
5fc50c2087
fix a typo [ci skip]
2014-12-15 18:11:32 +00:00
Vijay Dev
1a23410380
fix a typo [ci skip]
2014-12-15 23:24:09 +05:30
Andrey Nering
3cb11a3596
Already deprecated [ci skip]
2014-12-15 15:35:39 -02:00