aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused lineRyuta Kamizono2014-12-171-1/+0
|
* Merge pull request #18065 from y-yagi/fix_autoloading_guideXavier Noria2014-12-171-1/+1
|\ | | | | fix link in autoloading guide [ci skip]
| * fix link in autoloading guide [ci skip]yuuji.yaginuma2014-12-171-1/+1
|/
* `update_column` take ruby-land input, not database-land inputSean Griffin2014-12-164-3/+27
| | | | | | | | | | | | | | | In the case of serialized columns, we would expect the unserialized value as input, not the serialized value. The original issue which made this distinction, #14163, introduced a bug. If you passed serialized input to the method, it would double serialize when it was sent to the database. You would see the wrong input upon reloading, or get an error if you had a specific type on the serialized column. To put it another way, `update_column` is a special case of `update_all`, which would take `['a']` and not `['a'].to_yaml`, but you would not pass data from `params` to it. Fixes #18037
* Merge pull request #17980 from gsamokovarov/rescuable-case-operatorRafael Mendonça França2014-12-163-4/+45
|\ | | | | Add class level case operator support for error dispatching in Rescuable
| * Add class level case operator support for error dispatching in RescuableGenadi Samokovarov2014-12-103-4/+45
| |
* | Merge pull request #18059 from andreynering/ar-guides-queryingRafael Mendonça França2014-12-161-5/+28
|\ \ | | | | | | Improving Method Chaining section [ci skip]
| * | Improving Method Chaining section [ci skip]Andrey Nering2014-12-161-5/+28
|/ /
* | Merge pull request #17995 from ↵Rafael Mendonça França2014-12-162-0/+9
|\ \ | | | | | | | | | | | | jethroo/fix/assert_template_with_unsupported_layout_type assert template should raise ArgumentError for unsupported layout types
| * | adding that assert_template with :layout will raise ArgumentError for ↵Carsten Wirth2014-12-162-0/+9
| | | | | | | | | | | | unknown layout type
* | | Merge pull request #18055 from jonatack/patch-8Zachary Scott2014-12-161-2/+2
|\ \ \ | | | | | | | | "backoffice" -> "back office", "lookup" -> "look up" [ci skip]
| * | | "backoffice" -> "back office", "lookup" -> "look up"Jon Atack2014-12-161-2/+2
|/ / / | | | | | | | | | | | | "Lookup" is a noun, but not a verb. The verb is "look up". [skip ci]
* | | Merge pull request #18049 from yuki3738/fix_rails_db_command_errorRafael Mendonça França2014-12-161-1/+1
|\ \ \ | | | | | | | | Add a code checking about file or not to the rails db command
| * | | Add a code checking about file or not to the rails db commandyuki37382014-12-161-1/+1
| | | |
* | | | Merge pull request #18052 from timoschilling/reset_variantsRafael Mendonça França2014-12-162-1/+9
|\ \ \ \ | | | | | | | | | | allow reseting of request variants
| * | | | allow reseting of request variantsTimo Schilling2014-12-162-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ```
* | | | | Merge pull request #18032 from claudiob/add-test-for-after-validate-callbacksRafael Mendonça França2014-12-162-6/+28
|\ \ \ \ \ | | | | | | | | | | | | Add test for ActiveModel `after_validation`, `after_` and `around_` callbacks returning false
| * | | | | Add AM test: after/around callback returning falseclaudiob2014-12-141-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This stems from https://github.com/rails/rails/pull/17227#discussion_r21641358 It's simply a clarification of the current behavior by which if an `after_` or `around_` ActiveModel callback returns +false+, then the callback chain **is not halted**. The callback chain in ActiveModel is only halted when a `before_` callback returns `false`.
| * | | | | Add AM test for after_validation returning falseclaudiob2014-12-141-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This stems from https://github.com/rails/rails/pull/17227#discussion_r21641358 It's simply a clarification of the current behavior by which if an `after_validation` ActiveModel callback returns +false+, then further `after_` callbacks **are not halted**.
* | | | | | Merge pull request #18054 from jonatack/add_content_tag_testRafael Mendonça França2014-12-161-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Test to ensure content_tag works when fixing #17661
| * | | | | | Test to ensure content_tag works when fixing #17661Jon Atack2014-12-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | 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]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 15:49:39 +0000