Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #26059 from rails/rename-deadlock-detected-to-deadlocked | David Heinemeier Hansson | 2016-08-04 | 5 | -8/+8 | |
|\ \ \ \ \ | | | | | | | | | | | | | The problem isn't the detection but the deadlock itself | |||||
| * | | | | | Leave internal pgsql name intact as const reference | David Heinemeier Hansson | 2016-08-04 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | The problem isn't the detection but the deadlock itself | David Heinemeier Hansson | 2016-08-04 | 5 | -10/+10 | |
| | | | | | | ||||||
* | | | | | | Offer invitations to use retry_on/discard_on for common cases | David Heinemeier Hansson | 2016-08-04 | 1 | -0/+5 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #26049 from kamipo/add_gemfile_lock | Guillermo Iguaran | 2016-08-03 | 1 | -0/+37 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Add accidentally removed dependency in Gemfile.lock | |||||
| * | | | | Add accidentally removed dependency in Gemfile.lock | Ryuta Kamizono | 2016-08-04 | 1 | -0/+37 | |
|/ / / / | | | | | | | | | | | | | Follow up to ca0b6d0d416776655ed7516ac18f126fbde5315a. | |||||
* | | | | Guard against jobs that were persisted before we started counting executions ↵ | David Heinemeier Hansson | 2016-08-03 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | by zeroing out nil counters | |||||
* | | | | Don't require C dependencies on Windows/JRuby | Sean Griffin | 2016-08-03 | 2 | -39/+2 | |
| | | | | ||||||
* | | | | Add :weeks to the list of variable duration parts | Andrew White | 2016-08-03 | 3 | -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-classes | Rafael Mendonça França | 2016-08-03 | 5 | -26/+57 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new ActiveRecord transaction error classes Closes #26018 | |||||
| * | | | | Introduce new ActiveRecord transaction error classes | Erol Fornoles | 2016-05-24 | 5 | -26/+57 | |
| | | | | | ||||||
* | | | | | Merge pull request #26026 from ↵ | Rafael França | 2016-08-03 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/tx_serialization_error_should_inherit_statement_invalid `TransactionSerializationError` should inherit `StatementInvalid` for backward compatibility | |||||
| * | | | | | `TransactionSerializationError` should inherit `StatementInvalid` for ↵ | Ryuta Kamizono | 2016-08-02 | 1 | -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_instance | Rafael França | 2016-08-03 | 3 | -23/+16 | |
|\ \ \ \ \ | | | | | | | | | | | | | Avoid duplicated `set_inverse_instance` for target scope | |||||
| * | | | | | Avoid duplicated `set_inverse_instance` for target scope | Ryuta Kamizono | 2016-08-03 | 3 | -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_inquirer | Kasper Timm Hansen | 2016-08-03 | 1 | -0/+6 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add documentation for ActiveSupport::StringInquirer [ci skip] | |||||
| * | | | | | Add documentation for ActiveSupport::StringInquirer [ci skip] | kyatul | 2016-08-03 | 1 | -0/+6 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #25991 from rails/retry-and-discard-jobs | David Heinemeier Hansson | 2016-08-02 | 8 | -26/+289 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add retry_on/discard_on for better exception handling | |||||
| * | | | | | Amend the CHANGELOG | David Heinemeier Hansson | 2016-08-02 | 1 | -0/+21 | |
| | | | | | | ||||||
| * | | | | | Fix tests against ActiveSupport::Durations | David Heinemeier Hansson | 2016-08-02 | 3 | -32/+56 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into retry-and-discard-jobs | David Heinemeier Hansson | 2016-08-02 | 16 | -135/+108 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Please Rubocup | David Heinemeier Hansson | 2016-08-02 | 2 | -5/+5 | |
| | | | | | | | ||||||
| * | | | | | | Not needed | David Heinemeier Hansson | 2016-08-01 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | Allow for custom handling of exceptions that persist beyond the retry attempts | David Heinemeier Hansson | 2016-08-01 | 3 | -4/+21 | |
| | | | | | | | ||||||
| * | | | | | | Add exponentially_longer and custom wait algorithms | David Heinemeier Hansson | 2016-08-01 | 3 | -3/+68 | |
| | | | | | | | ||||||
| * | | | | | | Use descriptive exception names | David Heinemeier Hansson | 2016-08-01 | 2 | -20/+20 | |
| | | | | | | | ||||||
| * | | | | | | Executions counting is not a serialization concern | David Heinemeier Hansson | 2016-08-01 | 2 | -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 attempts | David Heinemeier Hansson | 2016-07-29 | 2 | -2/+3 | |
| | | | | | | | ||||||
| * | | | | | | Proper logging when we bail on retrying after X attempts | David Heinemeier Hansson | 2016-07-29 | 1 | -2/+6 | |
| | | | | | | | ||||||
| * | | | | | | Allow retries to happen with different priority and queue | David Heinemeier Hansson | 2016-07-29 | 1 | -2/+4 | |
| | | | | | | | ||||||
| * | | | | | | Require time extension for 3.seconds default | David Heinemeier Hansson | 2016-07-29 | 1 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | Mention defaults | David Heinemeier Hansson | 2016-07-29 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Satisfy pedantic rubocop whitespace detection | David Heinemeier Hansson | 2016-07-29 | 2 | -6/+6 | |
| | | | | | | | ||||||
| * | | | | | | Remove needless require | David Heinemeier Hansson | 2016-07-29 | 1 | -2/+0 | |
| | | | | | | | ||||||
| * | | | | | | Add retry_on/discard_on for better exception handling | David Heinemeier Hansson | 2016-07-29 | 6 | -26/+155 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #26022 from kamipo/remove_unnecessary_set_inverse_instance | Kasper Timm Hansen | 2016-08-02 | 1 | -6/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove unnecessary `set_inverse_instance` in finder methods | |||||
| * | | | | | | | Remove unnecessary `set_inverse_instance` in finder methods | Ryuta Kamizono | 2016-08-02 | 1 | -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 list | Rafael Mendonça França | 2016-08-02 | 1 | -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 Matsuda | 2016-08-03 | 1 | -5/+5 | |
| | | | | | | ||||||
* | | | | | | Remove extra connection pool creation | Arthur Neves | 2016-08-02 | 1 | -1/+0 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2016-08-02 | 4 | -4/+12 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Removed reference to callback_terminator.rb in docs | Iain Beeston | 2016-07-21 | 1 | -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 Sonpatki | 2016-07-16 | 1 | -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 Sonpatki | 2016-07-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | `_key_[]` [ci skip] | |||||
| * | | | | | | Add `config.assets.quiet` to configuration guide [ci skip] | Prathamesh Sonpatki | 2016-07-10 | 1 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | Add note about `config.annotations.register_directories` option in the ↵ | Prathamesh Sonpatki | 2016-07-10 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guides [ci skip] - Followup of #25692. | |||||
* | | | | | | | Fix wrong assignment. | Kasper Timm Hansen | 2016-08-02 | 1 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Screwed up both the left and right hand sides! | |||||
* | | | | | | | Set `always_permitted_parameters`. | Kasper Timm Hansen | 2016-08-02 | 1 | -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 Hansen | 2016-08-02 | 1 | -8/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looked odd, so completely detached from the other necessary part of the implementation. | |||||
* | | | | | | | Replace implicit formats with a case statement. | Kasper Timm Hansen | 2016-08-02 | 1 | -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. |