aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* adds a few cops and sortsXavier Noria2016-08-061-21/+48
|
* Merge pull request #25998 from kamipo/enum_with_alias_attributeEileen M. Uchitelle2016-08-062-5/+22
|\ | | | | Fix `enum` with `alias_attribute`
| * Fix `enum` with `alias_attribute`Ryuta Kamizono2016-07-312-5/+22
| | | | | | | | Fixes #25892.
* | Merge pull request #26023 from tekin/correct-acceptance-guidelinesEileen M. Uchitelle2016-08-061-1/+1
|\ \ | | | | | | Correct usage for acceptance validator in guide
| * | Correct usage for acceptance validator in guideTekin Suleyman2016-08-021-1/+1
| | |
* | | Merge pull request #26070 from claudiob/fix-404Claudio B2016-08-052-2/+2
|\ \ \ | | | | | | | | [ci skip] Fix broken URL in guides
| * | | [ci skip] Fix broken URL in guidesclaudiob2016-08-052-2/+2
|/ / /
* | | Merge pull request #25665 from kamipo/remove_unused_table_argEileen M. Uchitelle2016-08-051-5/+5
|\ \ \ | | | | | | | | Remove unused `table` arg for `UniquenessValidator#scope_relation`
| * | | Remove unused `table` arg for `UniquenessValidator#scope_relation`Ryuta Kamizono2016-07-181-5/+5
| | | |
* | | | Merge pull request #26051 from kamipo/make_name_and_binds_to_optional_argsEileen M. Uchitelle2016-08-053-6/+6
|\ \ \ \ | | | | | | | | | | Make `name` and `binds` to optional args for `exec_{insert,update,delete}`
| * | | | Make `name` and `binds` to optional args for `exec_{insert,update,delete}`Ryuta Kamizono2016-08-043-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `insert`, `update`, `delete`, and `exec_query` have a default value against `name` and `binds`. But `exec_insert`, `exec_update`, and `exec_delete` not have. It is an inconvenience and inconsistent.
* | | | | Fix GET JSON integration test request to use method overrideeileencodes2016-08-053-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a `GET` request is sent `as: :json` in an integration test the test should use Rack's method override to change to a post request so the paramters are included in the postdata. Otherwise it will not encode the parameters correctly for the integration test. Because integration test sets up it's own middleware, `Rack::MethodOverride` needs to be included in the integration tests as well. `headers ||= {}` was moved so that headers are never nil. They should default to a hash. Fixes #26033 [Eileen M. Uchitelle & Aaron Patterson]
* | | | | Add note about limitations of Windows Subsystem for LinuxAndrew White2016-08-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the limited support for inotify (Microsoft/BashOnWindows#216) in WSL the best thing to do at moment is add a note about skipping spring and listen when generating your application in the Getting Started guide. [skip ci] Fixes #26054.
* | | | | Don't assume all hashes are from multiparameter assignment in `composed_of`Sean Griffin2016-08-054-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So this bug is kinda funky. The code path is basically "if we weren't passed an instance of the class we compose to, and we have a converter, call that". Ignoring the hash case for a moment, everything after that was roughly intended to be the "else" clause, meaning that we are expected to have an instance of the class we compose to. Really, we should be blowing up in that case, as we can give a much better error message than what they user will likely get (e.g. `NameError: No method first for String` or something). Still, Ruby is duck typed, so if the object you're assigning responds to the same methods as the type you compose to, knock yourself out. The hash case was added in 36e9be8 to remove a bunch of special cased code from multiparameter assignment. I wrongly assumed that the only time we'd get a hash there is in that case. Multiparameter assignment will construct a very specific hash though, where the keys are integers, and we will have a set of keys covering `1..part.size` exactly. I'm pretty sure this could actually be passed around as an array, but that's a different story. Really I should convert this to something like `class MultiParameterAssignment < Hash; end`, which I might do soon. However for a change that I'm willing to backport to 4-2-stable, this is what I want to go with for the time being. Fixes #25978
* | | | | Merge pull request #26059 from rails/rename-deadlock-detected-to-deadlockedDavid Heinemeier Hansson2016-08-045-8/+8
|\ \ \ \ \ | | | | | | | | | | | | The problem isn't the detection but the deadlock itself
| * | | | | Leave internal pgsql name intact as const referenceDavid Heinemeier Hansson2016-08-041-2/+2
| | | | | |
| * | | | | The problem isn't the detection but the deadlock itselfDavid Heinemeier Hansson2016-08-045-10/+10
| | | | | |
* | | | | | Offer invitations to use retry_on/discard_on for common casesDavid Heinemeier Hansson2016-08-041-0/+5
| |/ / / / |/| | | |
* | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 21:16:45 +0000