aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)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`Ryuta Kamizono2016-07-312-5/+22
* | Merge pull request #26023 from tekin/correct-acceptance-guidelinesEileen M. Uchitelle2016-08-061-1/+1
|\ \
| * | 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 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`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}`Ryuta Kamizono2016-08-043-6/+6
* | | | | Fix GET JSON integration test request to use method overrideeileencodes2016-08-053-1/+23
* | | | | Add note about limitations of Windows Subsystem for LinuxAndrew White2016-08-051-0/+4
* | | | | Don't assume all hashes are from multiparameter assignment in `composed_of`Sean Griffin2016-08-054-2/+17
* | | | | Merge pull request #26059 from rails/rename-deadlock-detected-to-deadlockedDavid Heinemeier Hansson2016-08-045-8/+8
|\ \ \ \ \
| * | | | | 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.lockRyuta Kamizono2016-08-041-0/+37
|/ / / /
* | | | Guard against jobs that were persisted before we started counting executions ...David Heinemeier Hansson2016-08-031-1/+3
* | | | 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
* | | | 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 classesErol Fornoles2016-05-245-26/+57
* | | | | Merge pull request #26026 from kamipo/tx_serialization_error_should_inherit_s...Rafael França2016-08-031-1/+1
|\ \ \ \ \
| * | | | | `TransactionSerializationError` should inherit `StatementInvalid` for backwar...Ryuta Kamizono2016-08-021-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #26035 from kamipo/avoid_duplicated_set_inverse_instanceRafael França2016-08-033-23/+16
|\ \ \ \ \
| * | | | | Avoid duplicated `set_inverse_instance` for target scopeRyuta Kamizono2016-08-033-23/+16
* | | | | | Merge pull request #26036 from kyatul/doc_string_inquirerKasper Timm Hansen2016-08-031-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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
|\ \ \ \ \
| * | | | | 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
| * | | | | | 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
|\ \ \ \ \ \ \