aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #26049 from kamipo/add_gemfile_lockGuillermo Iguaran2016-08-031-0/+37
|\ | | | | Add accidentally removed dependency in Gemfile.lock
| * Add accidentally removed dependency in Gemfile.lockRyuta Kamizono2016-08-041-0/+37
|/ | | | Follow up to ca0b6d0d416776655ed7516ac18f126fbde5315a.
* Guard against jobs that were persisted before we started counting executions ↵David Heinemeier Hansson2016-08-031-1/+3
| | | | by zeroing out nil counters
* Don't require C dependencies on Windows/JRubySean Griffin2016-08-032-39/+2
|
* Add :weeks to the list of variable duration partsAndrew White2016-08-033-1/+41
| | | | | | | | Since 434df00 week durations are no longer converted to days. This means we need to add :weeks to the parts that ActiveSupport::TimeWithZone will consider being of variable duration to take account of DST transitions. Fixes #26039.
* Merge pull request #25107 from Erol/introduce-new-ar-transaction-error-classesRafael Mendonça França2016-08-035-26/+57
|\ | | | | | | | | | | Introduce new ActiveRecord transaction error classes Closes #26018
| * Introduce new ActiveRecord transaction error classesErol Fornoles2016-05-245-26/+57
| |
* | Merge pull request #26026 from ↵Rafael França2016-08-031-1/+1
|\ \ | | | | | | | | | | | | kamipo/tx_serialization_error_should_inherit_statement_invalid `TransactionSerializationError` should inherit `StatementInvalid` for backward compatibility
| * | `TransactionSerializationError` should inherit `StatementInvalid` for ↵Ryuta Kamizono2016-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | backward compatibility Originally `TransactionSerializationError` was `StatementInvalid` in Rails 5.0. It should keep backward compatibility.
* | | Merge pull request #26035 from kamipo/avoid_duplicated_set_inverse_instanceRafael França2016-08-033-23/+16
|\ \ \ | | | | | | | | Avoid duplicated `set_inverse_instance` for target scope
| * | | Avoid duplicated `set_inverse_instance` for target scopeRyuta Kamizono2016-08-033-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because `scope` (`target_scope`) is a `AssociationRelation`. `AssociationRelation` handles `set_inverse_instance`. https://github.com/rails/rails/blob/v5.0.0/activerecord/lib/active_record/association_relation.rb#L31-L33 See also #26022.
* | | | Merge pull request #26036 from kyatul/doc_string_inquirerKasper Timm Hansen2016-08-031-0/+6
|\ \ \ \ | |/ / / |/| | | Add documentation for ActiveSupport::StringInquirer [ci skip]
| * | | Add documentation for ActiveSupport::StringInquirer [ci skip]kyatul2016-08-031-0/+6
| |/ /
* | | Merge pull request #25991 from rails/retry-and-discard-jobsDavid Heinemeier Hansson2016-08-028-26/+289
|\ \ \ | | | | | | | | Add retry_on/discard_on for better exception handling
| * | | Amend the CHANGELOGDavid Heinemeier Hansson2016-08-021-0/+21
| | | |
| * | | Fix tests against ActiveSupport::DurationsDavid Heinemeier Hansson2016-08-023-32/+56
| | | |
| * | | Merge branch 'master' into retry-and-discard-jobsDavid Heinemeier Hansson2016-08-0216-135/+108
| |\ \ \
| * | | | Please RubocupDavid Heinemeier Hansson2016-08-022-5/+5
| | | | |
| * | | | Not neededDavid Heinemeier Hansson2016-08-011-1/+0
| | | | |
| * | | | Allow for custom handling of exceptions that persist beyond the retry attemptsDavid Heinemeier Hansson2016-08-013-4/+21
| | | | |
| * | | | Add exponentially_longer and custom wait algorithmsDavid Heinemeier Hansson2016-08-013-3/+68
| | | | |
| * | | | Use descriptive exception namesDavid Heinemeier Hansson2016-08-012-20/+20
| | | | |
| * | | | Executions counting is not a serialization concernDavid Heinemeier Hansson2016-08-012-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Let’s do it when we actually execute instead. Then the tests dealing with comparable serializations won’t fail either!
| * | | | Reraise instead of swallow exceptions that occur beyond the retry attemptsDavid Heinemeier Hansson2016-07-292-2/+3
| | | | |
| * | | | Proper logging when we bail on retrying after X attemptsDavid Heinemeier Hansson2016-07-291-2/+6
| | | | |
| * | | | Allow retries to happen with different priority and queueDavid Heinemeier Hansson2016-07-291-2/+4
| | | | |
| * | | | Require time extension for 3.seconds defaultDavid Heinemeier Hansson2016-07-291-0/+2
| | | | |
| * | | | Mention defaultsDavid Heinemeier Hansson2016-07-291-2/+2
| | | | |
| * | | | Satisfy pedantic rubocop whitespace detectionDavid Heinemeier Hansson2016-07-292-6/+6
| | | | |
| * | | | Remove needless requireDavid Heinemeier Hansson2016-07-291-2/+0
| | | | |
| * | | | Add retry_on/discard_on for better exception handlingDavid Heinemeier Hansson2016-07-296-26/+155
| | | | |
* | | | | Merge pull request #26022 from kamipo/remove_unnecessary_set_inverse_instanceKasper Timm Hansen2016-08-021-6/+2
|\ \ \ \ \ | | | | | | | | | | | | Remove unnecessary `set_inverse_instance` in finder methods
| * | | | | Remove unnecessary `set_inverse_instance` in finder methodsRyuta Kamizono2016-08-021-6/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Because `scope` (`target_scope`) is a `AssociationRelation`. `AssociationRelation` handles `set_inverse_instance`. https://github.com/rails/rails/blob/v5.0.0/activerecord/lib/active_record/association_relation.rb#L31-L33
* | | | | Add 4.2.Z back to the maintenance listRafael Mendonça França2016-08-021-1/+1
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Some Rails core members agreed to continue to maintain 4.2 until 5.1 is released. [ci skip]
* | | | Show supported DBs first in `rails new --help`Akira Matsuda2016-08-031-5/+5
| | | |
* | | | Remove extra connection pool creationArthur Neves2016-08-021-1/+0
| | | |
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-08-024-4/+12
|\ \ \ \
| * | | | Removed reference to callback_terminator.rb in docsIain Beeston2016-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | That file has been removed and replaced with new_framework_defaults.rb
| * | | | Fix documentation of `index` option for the `add_reference` method [ci skip]Prathamesh Sonpatki2016-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/23179.
| * | | | The `to_query` method on Array objects uses `key[] as the prefix, not ↵Prathamesh Sonpatki2016-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | `_key_[]` [ci skip]
| * | | | Add `config.assets.quiet` to configuration guide [ci skip]Prathamesh Sonpatki2016-07-101-0/+2
| | | | |
| * | | | Add note about `config.annotations.register_directories` option in the ↵Prathamesh Sonpatki2016-07-101-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guides [ci skip] - Followup of #25692.
* | | | | Fix wrong assignment.Kasper Timm Hansen2016-08-021-4/+5
| | | | | | | | | | | | | | | | | | | | Screwed up both the left and right hand sides!
* | | | | Set `always_permitted_parameters`.Kasper Timm Hansen2016-08-021-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests were written with the common false value seen in Rails apps, show that intent in the code. Should also fix the build on 5-0-stable.
* | | | | Move the YAML hook closer to `init_with`.Kasper Timm Hansen2016-08-021-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Looked odd, so completely detached from the other necessary part of the implementation.
* | | | | Replace implicit formats with a case statement.Kasper Timm Hansen2016-08-021-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The coder that Psych passes in has a `tag` method we can use to detect which serialization format we're reviving for. Use it and make it clearer alongside the `load_tags` fiddling.
* | | | | Let Psych 2.0.9+ deserialize 2.0.8 serialized parameters.Kasper Timm Hansen2016-08-022-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we were to serialize an `ActionController::Parameters` on Psych 2.0.8, we'd get: ```yaml --- !ruby/hash:ActionController::Parameters key: :value ``` Because 2.0.8 didn't store instance variables, while 2.0.9 did: https://github.com/tenderlove/psych/commit/8f84ad0fc711a82a1040def861cb121e8985fd4c That, coupled with 2.0.8 calling `new` instead of `allocate` meant parameters was deserialized just fine: https://github.com/tenderlove/psych/commit/af308f8307899cb9e1c0fffea4bce3110a1c3926 However, if users have 2.0.8 serialized parameters, then upgrade to Psych 2.0.9+ and Rails 5, it would start to blow up because `initialize` will never be called, and thus `@parameters` will never be assigned. Hello, `NoMethodErrors` on `NilClass`! :) To fix this we register another variant of the previous serialization format and take it into account in `init_with`. I've tested this in our app and previously raising code now deserializes like a champ. I'm unsure how to test this in our suite because we use Psych 2.0.8 and don't know how to make us use 2.0.9+ for just one test.
* | | | | Merge pull request #26017 from ↵Kasper Timm Hansen2016-08-022-0/+51
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | kaspth/parameters-yaml-format-backwardscompatibility Make Parameters support legacy YAML encodings.
| * | | | Make Parameters support legacy YAML encodings.Kasper Timm Hansen2016-08-012-0/+51
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By changing ActionController::Parameter's superclass, Rails 5 also changed the YAML serialization format. Since YAML doesn't know how to handle parameters it would fallback to its routine for the superclass, which in Rails 4.2 was Hash while just Object in Rails 5. As evident in the tags YAML would spit out: 4.2: !ruby/hash-with-ivars:ActionController::Parameters 5.0: !ruby/object:ActionController::Parameters Thus when loading parameters YAML from 4.2 in Rails 5, it would parse a hash dump as it would an Object class. To fix this we have to provide our own `init_with` to be aware of the past format as well as the new one. Then we add a `load_tags` mapping, such that when the YAML parser sees `!ruby/hash-with-ivars:ActionController::Parameters`, it knows to call our `init_with` function and not try to instantiate it as a normal hash subclass.
* | | | Merge pull request #25986 from ↵Sean Griffin2016-08-011-29/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/remove_unnecessary_methods_for_null_relation Remove unnecessary methods for `NullRelation`
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 09:44:17 +0000