aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #18031 from claudiob/better-tests-for-callbacks-terminatorRafael Mendonça França2014-12-162-19/+38
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Add test for `:skip_after_callbacks_if_terminated`
| * | | | | | | Add test for `:skip_after_callbacks_if_terminated`claudiob2014-12-142-19/+38
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `define_callbacks` from `ActiveSupport::Callbacks` accepts the `:skip_after_callbacks_if_terminated` option since #4866 but the option is not tested anywhere. This commit adds tests and fixes documentation for the option, making it clear that halting a callback chain only stops following `before_` and `around_` callbacks by default.
* | | | | | | Merge pull request #18050 from jonatack/patch-13Xavier Noria2014-12-161-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve section in constant autoload guide
| * | | | | | | Improve section in constant autoload guideJon Atack2014-12-161-7/+7
| | |/ / / / / | |/| | | | | | | | | | | | [skip ci]
* | | | | | | Merge pull request #18036 from ↵Rafael Mendonça França2014-12-161-19/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | claudiob/remove-redundant-tests-about-around-actions-returning-false Remove misleading test: around_action return false
| * | | | | | | Remove misleading test: around_action return falseclaudiob2014-12-151-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge pull request #18053 from georgemillo/patch-2Arthur Nogueira Neves2014-12-161-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | English fix [ci skip]
| * | | | | | | | English fix [ci skip]George Millo2014-12-161-3/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #18051 from jonatack/patch-14Eileen M. Uchitelle2014-12-161-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve grammar
| * | | | | | | | Improve grammarJon Atack2014-12-161-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | [skip ci]
* | | | | | | | Merge pull request #18048 from jonatack/patch-8Xavier Noria2014-12-161-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Constant autoload grammar fix
| * | | | | | | Constant autoload grammar fixJon Atack2014-12-161-2/+2
|/ / / / / / / | | | | | | | | | | | | | | [skip ci]
* | | | | | | docs, synchronize CHANGELOG across branches. [ci skip]Yves Senn2014-12-161-11/+12
| | | | | | |
* | | | | | | Merge pull request #18047 from ↵Abdelkader Boudih2014-12-161-5/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JuanitoFatas/patch/constant_autoloading_and_reloading-list-items [ci skip] :scissors: blank lines between list items.
| * | | | | | | [ci skip] :scissors: blank lines between list items.Juanito Fatas2014-12-161-5/+0
| | |_|/ / / / | |/| | | | |
* / | | | | | decribe deprecation cycle from `timestamps null: false` to `null: true`.Yves Senn2014-12-161-0/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] /cc @sgrif @zzak Conflicts: activerecord/CHANGELOG.md
* | | | | | undoes a recent merged edit [ci skip]Xavier Noria2014-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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".
* | | | | | missing preposition [ci skip]Xavier Noria2014-12-161-1/+1
| | | | | |
* | | | | | syncs the autoloading guide and undoes some merged changes [ci skip]Xavier Noria2014-12-161-17/+16
| | | | | |
* | | | | | Remove this tip, if the previous statement is true.. ie: The reader sees "RailsZachary Scott2014-12-151-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #17992 from andreynering/guides-intallationZachary Scott2014-12-151-6/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improving tips about installation in the guides [ci skip]
| * | | | | | Improving tips about installation in the guides [ci skip]Andrey Nering2014-12-121-6/+11
| | | | | | |
* | | | | | | Merge branch 'jonatack-patch-8' [ci skip]Zachary Scott2014-12-151-7/+9
|\ \ \ \ \ \ \
| * | | | | | | Merge branch 'patch-8' of https://github.com/jonatack/rails into ↵Zachary Scott2014-12-151-7/+9
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jonatack-patch-8 [ci skip] Conflicts: guides/source/constant_autoloading_and_reloading.md
| * | | | | | | Update constant_autoloading_and_reloading.mdJon Atack2014-12-151-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci] Follow-up to previous commit [skip ci] Fix previous merge [skip ci]
* | | | | | | | Merge pull request #18046 from stephenminded/counter_cache_docs_fixArthur Nogueira Neves2014-12-151-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Counter cache Rails guides fix
| * | | | | | | | You need to specify the counter_cache option on the has_many side of the ↵Steve Lounsbury2014-12-161-1/+7
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | 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]
* | | | | | | | Add CHANGELOG for #18034 [ci skip]Zachary Scott2014-12-151-0/+4
| | | | | | | |
* | | | | | | | Merge pull request #18034 from andreynering/ar-guides-queryingZachary Scott2014-12-151-0/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Adding method chaining section on ActiveRecord querying guide [ci skip]
| * | | | | | | | Adding method chaining section on ActiveRecord querying guide [ci skip]Andrey Nering2014-12-151-0/+35
| | | | | | | | |
* | | | | | | | | Ruby will allocate the class as a side-effect, since it is already defined.Zachary Scott2014-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge pull request #18040 from jonatack/patch-11Zachary Scott2014-12-151-10/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Improve autoload_paths section [ci skip]
| * | | | | | | | Improve autoload_paths sectionJon Atack2014-12-151-10/+9
| | |/ / / / / / | |/| | | | | | | | | | | | | | [skip ci]
* | | | | | | | Merge pull request #18043 from claudiob/minor-autoloading-guides-fixesAbdelkader Boudih2014-12-161-8/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Minor typos/fixes to autoloading guide
| * | | | | | | | Minor typos/fixes to autoloading guideclaudiob2014-12-151-8/+8
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @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]
* | | | | | | | Regression test for #18024Santiago Pastorino2014-12-151-0/+5
| | | | | | | |
* | | | | | | | Revert "Re-enable capture'ing non-String values"Santiago Pastorino2014-12-154-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c2fe0938d7201d4ce0bb2f25e72bf5f70df128af.
* | | | | | | | Merge pull request #16924 from Sinjo/params-deep-munge-empty-arrayGodfrey Chan2014-12-157-23/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't convert empty arrays to nils when deep munging params
| * | | | | | | | Don't convert empty arrays to nils when deep munging paramsChris Sinjakli2014-12-157-23/+21
| | |/ / / / / / | |/| | | | | |
* | | | | | | | autoloading guide: applies some Strunk & White and hyperlinking [ci skip]Xavier Noria2014-12-151-101/+80
| | | | | | | |
* | | | | | | | Merge pull request #18041 from andreynering/ar-guides-querying-2Rafael Mendonça França2014-12-151-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Dynamic finders already deprecated [ci skip]
| * | | | | | | Already deprecated [ci skip]Andrey Nering2014-12-151-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #18038 from seuros/typofixRafael Mendonça França2014-12-151-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | fix a typo [ci skip]
| * | | | | | fix a typo [ci skip]Abdelkader Boudih2014-12-151-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-12-153-6/+41
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [ci skip] Fix output of video_tag helperAnton Cherepanov2014-12-071-1/+4
| | | | | | |
| * | | | | | Better doc for AS::DateTime#seconds_since_midnightclaudiob2014-12-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds examples and keeps coherent with the documentation of the similar method `seconds_until_end_of_day`. [ci skip]
| * | | | | | Merge branch 'document-time-with-zone-plus-and-minus'claudiob2014-12-041-4/+32
| |\ \ \ \ \ \
| | * | | | | | Add docs for AS::TimeWithZone + and -claudiob2014-12-041-4/+32
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example was taken from the commit message 676d6a6. [ci skip]
| * | | | | | Merge branch 'master' of github.com:rails/railsVijay Dev2014-11-30396-4136/+3261
| |\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 18:37:05 +0000