aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20944 from repinel/fix-time-with-zone-eqlKasper Timm Hansen2015-07-193-1/+13
|\ | | | | Fix `TimeWithZone#eql?` to handle `TimeWithZone` created from `DateTime`
| * Fix `TimeWithZone#eql?` to handle `TimeWithZone` created from `DateTime`Roque Pinel2015-07-193-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ```ruby twz = DateTime.now.in_time_zone twz.eql?(twz.dup) => false ``` Now: ```ruby twz = DateTime.now.in_time_zone twz.eql?(twz.dup) => true ``` Please notice that this fix the `TimeWithZone` comparison to itself, not to `DateTime`. Based on #3725, `DateTime` should not be equal to `TimeWithZone`.
* | Merge pull request #20931 from eliotsykes/force_ssl-docs-options-formattingKasper Timm Hansen2015-07-191-6/+6
|\ \ | | | | | | Fix formatting of force_ssl options documentation [ci skip]
| * | Fix formatting of force_ssl options documentation [ci skip]Eliot Sykes2015-07-191-6/+6
|/ /
* | Merge pull request #20924 from andrii/masterAbdelkader Boudih2015-07-191-1/+1
|\ \ | | | | | | [ci skip] Fix typo in #any? RDoc
| * | [ci skip] Fix typo in #any? RDocAndrii Ponomarov2015-07-171-1/+1
| | |
* | | Merge pull request #20839 from ↵Sean Griffin2015-07-181-9/+34
|\ \ \ | |_|/ |/| | | | | | | | TheBlasfem/added_examples_dateandtime_calculations Added examples to DateAndTime::Calculations [ci skip]
| * | added examples to DateAndTime::Calculations [ci skip]Julio Lopez2015-07-181-9/+34
| | |
* | | Merge pull request #20932 from twalpole/collection_association_parametersSean Griffin2015-07-182-1/+19
|\ \ \ | | | | | | | | Ensure that 'ActionController::Parameters' can still be passed to AR …
| * | | Ensure that 'ActionController::Parameters' can still be passed to AR for ↵Thomas Walpole2015-07-182-1/+19
| | | | | | | | | | | | | | | | collection associations
* | | | Ensure cyclic associations w/ autosave don't cause duplicate errorsSean Griffin2015-07-185-0/+37
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is so fucked. Things that cause this bug not to replicate: - Defining the validation before the association (we end up calling `uniq!` on the errors in the autosave validation) - Adding `accepts_nested_attributes_for` (I have no clue why. The only thing it does that should affect this is adds `autosave: true` to the inverse reflection, and doing that manually doesn't fix this). This solution is a hack, and I'm almost certain there's a better way to go about it, but this shouldn't cause a huge hit on validation times, and is the simplest way to get it done. Fixes #20874.
* | | Merge pull request #20763 from maurogeorge/default_scope_create-docSean Griffin2015-07-181-0/+12
|\ \ \ | | | | | | | | Add a note about default_scope and create records [ci skip]
| * | | Add a note about default_scope and create recordsMauro George2015-07-161-0/+12
| | | | | | | | | | | | | | | | [ci skip]
* | | | Ensure that `ActionController::Parameters` can still be passed to ARSean Griffin2015-07-183-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since nested hashes are also instances of `ActionController::Parameters`, and we're explicitly looking to work with a hash for nested attributes, this caused breakage in several points. This is the minimum viable fix for the issue (and one that I'm not terribly fond of). I can't think of a better place to handle this at the moment. I'd prefer to use some sort of solution that doesn't special case AC::Parameters, but we can't use something like `to_h` or `to_a` since `Enumerable` adds both. While I've added a trivial test case for verifying this fix in isolation, we really need better integration coverage to prevent regressions like this in the future. We don't actually have a lot of great places for integration coverage at the moment, so I'm deferring it for now. Fixes #20922.
* | | | Merge pull request #20930 from prathamesh-sonpatki/rm-render-textSean Griffin2015-07-181-1/+1
|\ \ \ \ | | | | | | | | | | Replaced render :text with render :plain in AC gem bug report template
| * | | | Replaced render :text with render :plain in AC gem bug report templatePrathamesh Sonpatki2015-07-181-1/+1
|/ / / / | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/20929. [ci skip]
* | | | Merge pull request #20929 from y-yagi/fix_deprecated_warningKasper Timm Hansen2015-07-181-1/+1
|\ \ \ \ | | | | | | | | | | use `plain` option instead of deprecated `text` option
| * | | | use `plain` option instead of deprecated `text` optionyuuji.yaginuma2015-07-181-1/+1
|/ / / / | | | | | | | | | | | | this will silence deprecation warnings
* | | | Merge pull request #20923 from sikachu/silence-render-text-warningMatthew Draper2015-07-1841-245/+247
|\ \ \ \ | | | | | | | | | | Stop using deprecated `render :text` in test
| * | | | Stop using deprecated `render :text` in testPrem Sichanugrist2015-07-1741-245/+247
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will silence deprecation warnings. Most of the test can be changed from `render :text` to render `:plain` or `render :body` right away. However, there are some tests that needed to be fixed by hand as they actually assert the default Content-Type returned from `render :body`.
* | | | Merge pull request #20917 from sikachu/ps-deprecate-render-textJeremy Daer (Kemper)2015-07-172-11/+56
|\ \ \ \ | |_|_|/ |/| | | Add deprecation warning for `render :text`
| * | | Add deprecation warning for `render :text`Prem Sichanugrist2015-07-172-11/+56
| | | | | | | | | | | | | | | | | | | | | | | | We've started on discouraging the usage of `render :text` in #12374. This is a follow-up commit to make sure that we print out the deprecation warning.
* | | | push fields_for_style? in to a protected methodAaron Patterson2015-07-171-5/+5
| | | | | | | | | | | | | | | | | | | | this way we don't need to call `to_unsafe_h` to get access to ask questions about the underlying hash
* | | | Merge pull request #20902 from sikachu/silence-association-reload-warningSean Griffin2015-07-1710-105/+125
|\ \ \ \ | | | | | | | | | | Silence deprecation warning from force reload
| * | | | Silence deprecation warning from force reloadPrem Sichanugrist2015-07-1610-105/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We deprecate the support for passing an argument to force reload in 6eae366d0d2e5d5211eeaf955f56bd1dc6836758. That led to several deprecation warning when running Active Record test suite. This commit silence the warnings by properly calling `#reload` on the association proxy or on the association object instead. However, there are several places that `ActiveSupport::Deprecation.silence` are used as those tests actually tests the force reload functionality and will be removed once `master` is targeted next minor release (5.1).
* | | | | push is_a checks up the stackAaron Patterson2015-07-171-13/+13
| | | | | | | | | | | | | | | | | | | | now `hash_filter` doesn't need to know about the `Parameters` class
* | | | | remove useless conditionalAaron Patterson2015-07-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Since we proved that `element` is always of type `Parameter`, we know that it will always respond to `permit`, so lets remove this conditional
* | | | | Merge pull request #20125Sean Griffin2015-07-173-0/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Manually merged to fix conflicts.
| * | | | | ActiveSupport::HashWithIndifferentAccess select and reject should return ↵Bernard Potocki2015-07-173-0/+19
|/ / / / / | | | | | | | | | | | | | | | enumerator if called without block
* | | | | remove useless conditionalsAaron Patterson2015-07-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `element` can never be a hash because: 1. `slice` returns a Parameters object and calls each on it: https://github.com/rails/rails/blob/cb3f25593b1137e344086364d4b1a52c08e8eb3b/actionpack/lib/action_controller/metal/strong_parameters.rb#L656 2. `each` which is implemented by `each_pair` will call `convert_hashes_to_parameters` on the value: https://github.com/rails/rails/blob/cb3f25593b1137e344086364d4b1a52c08e8eb3b/actionpack/lib/action_controller/metal/strong_parameters.rb#L192-197 3. `convert_hashes_to_parameters` will convert any hash objects in to parameters objects: https://github.com/rails/rails/blob/cb3f25593b1137e344086364d4b1a52c08e8eb3b/actionpack/lib/action_controller/metal/strong_parameters.rb#L550-566
* | | | | remove useless functionAaron Patterson2015-07-171-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the value is cached on the stack, `array_of_permitted_scalars_filter` is exactly the same as `array_of_permitted_scalars?`, so lets just have one
* | | | | stop passing `params` to `array_of_permitted_scalars_filter`Aaron Patterson2015-07-171-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this way the method doesn't have to know what the new params object is, it just yields to a block. This change also caches the value of `self[key]` on the stack
* | | | | push key checking upAaron Patterson2015-07-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should disconnect `array_of_permitted_scalars_filter` from the instance so that we can make hash filtering functional. For now, pull the conditional up out of that method
* | | | | Merge pull request #20918 from jonatack/fix-lookup-grammarRafael Mendonça França2015-07-177-14/+17
|\ \ \ \ \ | |_|/ / / |/| | | | [skip ci] Lookup can be a noun but it is not a verb
| * | | | [skip ci] Lookup can be a noun but it is not a verbJon Atack2015-07-177-14/+17
|/ / / / | | | | | | | | | | | | Various grammar corrections and wrap to 80 characters.
* | | | Merge pull request #20915 from robin850/jruby-skipsSean Griffin2015-07-173-0/+8
|\ \ \ \ | | | | | | | | | | Skip a few failing tests on JRuby with the attached tickets
| * | | | Skip a few failing tests on JRuby with the attached ticketsRobin Dupret2015-07-173-0/+8
|/ / / /
* | | | Merge pull request #20909 from yui-knk/fix/test-commnadClaudio B.2015-07-171-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Add `bundle exec` to test run command
| * | | | [ci skip] Add `bundle exec` to test run commandyui-knk2015-07-171-1/+1
| | | | |
* | | | | Merge pull request #20905 from imtayadeway/tw/fix-db-pooling-docsClaudio B.2015-07-171-7/+7
|\ \ \ \ \ | | | | | | | | | | | | [skip ci] Improve grammar/style in DB pooling guide.
| * | | | | [skip ci] Improve grammar/style in DB pooling guide.Tim Wade2015-07-161-7/+7
| |/ / / /
* | | | | Oops! :bomb:Akira Matsuda2015-07-171-1/+1
| | | | |
* | | | | "warning: instance variable @routes not initialized"Akira Matsuda2015-07-171-1/+1
|/ / / /
* | | | Merge pull request #20892 from zoltankiss/make-params-method-returns-consistentRafael Mendonça França2015-07-151-1/+1
|\ \ \ \ | |/ / / |/| | | Standardize `ActionController::Parameters#to_unsafe_h` return value
| * | | Standardize `ActionController::Parameters#to_unsafe_h` return valueZoltan Kiss2015-07-151-1/+1
|/ / / | | | | | | | | | | | | | | | `ActionController::Parameters#to_h` returns a hash, so lets have `ActionController::Parameters#to_unsafe_h` return a hash instead of an `ActiveSupport::HashWithIndifferentAccess` for consistency.
* | | Merge pull request #20888 from sikachu/remove-support-for-force-reloadRafael Mendonça França2015-07-159-0/+70
|\ \ \ | | | | | | | | Deprecate force association reload by passing true
| * | | Deprecate force association reload by passing truePrem Sichanugrist2015-07-159-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to simplify the association API, as you can call `reload` on the association proxy or the parent object to get the same result. For collection association, you can call `#reload` on association proxy to force a reload: @user.posts.reload # Instead of @user.posts(true) For singular association, you can call `#reload` on the parent object to clear its association cache then call the association method: @user.reload.profile # Instead of @user.profile(true) Passing a truthy argument to force association to reload will be removed in Rails 5.1.
* | | | Merge pull request #20868 from sikachu/params-not-inherited-from-hwiaRafael Mendonça França2015-07-1510-38/+167
|\ \ \ \ | |/ / / |/| | | Make AC::Parameters not inherited from Hash
| * | | Update documentation on `AC::Parameters`Prem Sichanugrist2015-07-152-7/+33
| | | |
| * | | Make AC::Parameters not inherited from HashPrem Sichanugrist2015-07-1510-35/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is another take at #14384 as we decided to wait until `master` is targeting Rails 5.0. This commit is implementation-complete, as it guarantees that all the public methods on the hash-inherited Parameters are still working (based on test case). We can decide to follow-up later if we want to remove some methods out from Parameters.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 19:45:08 +0000