aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* show error message when error raised in rails runneryuuji.yaginuma2016-08-032-5/+9
* 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
|\ \ \
| * | | Remove unnecessary `set_inverse_instance` in finder methodsRyuta Kamizono2016-08-021-6/+2
* | | | Add 4.2.Z back to the maintenance listRafael Mendonça França2016-08-021-1/+1
| |_|/ |/| |
* | | 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
| * | | Fix documentation of `index` option for the `add_reference` method [ci skip]Prathamesh Sonpatki2016-07-161-1/+1
| * | | The `to_query` method on Array objects uses `key[] as the prefix, not `_key_[...Prathamesh Sonpatki2016-07-101-1/+1
| * | | 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 guides...Prathamesh Sonpatki2016-07-101-1/+7
* | | | Fix wrong assignment.Kasper Timm Hansen2016-08-021-4/+5
* | | | Set `always_permitted_parameters`.Kasper Timm Hansen2016-08-021-0/+9
* | | | Move the YAML hook closer to `init_with`.Kasper Timm Hansen2016-08-021-8/+9
* | | | Replace implicit formats with a case statement.Kasper Timm Hansen2016-08-021-7/+8
* | | | Let Psych 2.0.9+ deserialize 2.0.8 serialized parameters.Kasper Timm Hansen2016-08-022-4/+24
* | | | Merge pull request #26017 from kaspth/parameters-yaml-format-backwardscompati...Kasper Timm Hansen2016-08-022-0/+51
|\ \ \ \ | |_|/ / |/| | |
| * | | Make Parameters support legacy YAML encodings.Kasper Timm Hansen2016-08-012-0/+51
|/ / /
* | | Merge pull request #25986 from kamipo/remove_unnecessary_methods_for_null_rel...Sean Griffin2016-08-011-29/+7
|\ \ \
| * | | Remove unnecessary methods for `NullRelation`Ryuta Kamizono2016-07-291-29/+7
| | |/ | |/|
* | | Merge pull request #26004 from y-yagi/remove_unnecessary_require_and_extendSantiago Pastorino2016-08-011-8/+0
|\ \ \
| * | | remove unnecessary require and extendyuuji.yaginuma2016-07-311-8/+0
* | | | Merge pull request #26001 from yui-knk/warningKasper Timm Hansen2016-08-011-0/+1
|\ \ \ \
| * | | | Suppress warningsyui-knk2016-07-311-0/+1
| |/ / /
* | | | Merge pull request #26013 from y-yagi/remove_old_links_about_debuggerKasper Timm Hansen2016-08-011-7/+0
|\ \ \ \ | |/ / / |/| | |
| * | | remove old links from debugging guide [ci skip]yuuji.yaginuma2016-08-011-7/+0
|/ / /
* | | Merge pull request #25992 from rails/revert-25914-jm/not_inDavid Heinemeier Hansson2016-07-294-81/+0
|\ \ \ | |/ / |/| |
| * | Revert "Adds `not_in?` onto Object"David Heinemeier Hansson2016-07-294-81/+0
|/ /
* | Merge pull request #25965 from nicksieger/ac_test_case_reset_rack_inputGuillermo Iguaran2016-07-283-0/+23
|\ \
| * | Test that ActionDispatch::IntegrationTest does not leak parametersNick Sieger2016-07-281-0/+14
| * | Reset rack.input when the environment is scrubbed for the next requestNick Sieger2016-07-272-0/+9