| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #24965 from arthurnn/arthurnn/conn_api | Arthur Nogueira Neves | 2016-05-29 | 7 | -37/+43 |
| |\ | | | | | Change some establish_connection logic | ||||
| | * | Add to_hash to specification | Arthur Neves | 2016-05-25 | 4 | -4/+7 |
| | | | |||||
| | * | Remove `name` from `establish_connection` | Arthur Neves | 2016-05-24 | 7 | -33/+32 |
| | | | | | | | | | | | Instead of passing a separete name variable, we can make the resolver merge a name on the config, and use that before creating the Specification. | ||||
| | * | Move establish_connection to handler | Arthur Neves | 2016-05-24 | 3 | -14/+18 |
| | | | |||||
| * | | Merge pull request #25184 from ↵ | David Heinemeier Hansson | 2016-05-29 | 11 | -35/+37 |
| |\ \ | | | | | | | | | | | | | prathamesh-sonpatki/move-up-framework-initializers Move new default initializers into separate directory | ||||
| | * | | Move new default initializers into separate directory | Prathamesh Sonpatki | 2016-05-28 | 11 | -35/+37 |
| | | | | | | | | | | | | | | | | | | | - These initializers are new defaults for Rails 5 and newly generated apps do not need to change them. - Fixes #25181 | ||||
| * | | | Merge pull request #25190 from willnet/fix-action-cable-guides | प्रथमेश Sonpatki | 2016-05-29 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | [ci skip]Fix wrong require path raising LoadError | ||||
| | * | | | [ci skip]Fix wrong require path raising LoadError | willnet | 2016-05-29 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #25189 from xtian/patch-1 | प्रथमेश Sonpatki | 2016-05-29 | 1 | -5/+5 |
| |\ \ \ | | | | | | | | | ActionController::Parameters: Fix #dig doc code | ||||
| | * | | | ActionController::Parameters: Fix #dig doc code | Christian Wesselhoeft | 2016-05-29 | 1 | -5/+5 |
| |/ / / | | | | | | | This example code wasn't getting wrapped in a `<code>` tag due to incorrect indentation. | ||||
| * | | | Merge pull request #25188 from y-yagi/rename_enum_prefix_suffix | Kasper Timm Hansen | 2016-05-29 | 1 | -2/+3 |
| |\ \ \ | |/ / |/| | | rename enum_prefix and enum_suffix options to _prefix and _suffix [ci skip] | ||||
| | * | | rename enum_prefix and enum_suffix options to _prefix and _suffix [ci skip] | yuuji.yaginuma | 2016-05-29 | 1 | -2/+3 |
| |/ / | | | | | | | | | `:enum_prefix` and `:enum_suffix` was changed to `:_prefix` and `:_suffix` in #20999. | ||||
| * | | Fix more assertion counts. | Kasper Timm Hansen | 2016-05-28 | 1 | -2/+2 |
| | | | | | | | | | Follow up to e45f388. | ||||
| * | | Fix assertion count after 69e1bb52. | Kasper Timm Hansen | 2016-05-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When changing the generated integration tests to assert redirects with an absolute path this redirection check in `assert_redirected_to` against the absolute response location would now pass: https://github.com/rails/rails/blob/af245aaf3a1c447752a1b5895adddc66e5f73c00/actionpack/lib/action_dispatch/testing/assertions/response.rb#L55 Thus we'd break early instead of hitting `assert_operator` and have 2 fewer assertions per `assert_redirected_to` as `assert_operator` is composed of 2 assertions internally: https://github.com/seattlerb/minitest/blob/4e146b1515b19a5c474e39c174b037510f6dbc6e/lib/minitest/assertions.rb#L254-L258 Deduct 2 assertions for 2 redirects taking the expected count down by 4 in total for the two failing tests. | ||||
| * | | Merge pull request #25182 from rails/remove-public-files-for-api-apps | David Heinemeier Hansson | 2016-05-28 | 2 | -1/+18 |
| |\ \ | | | | | | | Remove public/ files for API apps | ||||
| | * | | Remove public/ files for API apps | Prathamesh Sonpatki | 2016-05-28 | 2 | -1/+18 |
| | | | | | | | | | | | | | - Fixes #25180 | ||||
| * | | | Redirects are to urls, not paths | David Heinemeier Hansson | 2016-05-28 | 1 | -3/+3 |
| | | | | |||||
| * | | | The first comment does not explain anything that the code doesnt and the ↵ | David Heinemeier Hansson | 2016-05-28 | 1 | -2/+0 |
| | | | | | | | | | | | | | second is now irrelevant with the dedicated API mode | ||||
| * | | | Boil down custom Action Cable configuration to a single block | David Heinemeier Hansson | 2016-05-28 | 1 | -4/+2 |
| |/ / | |||||
| * | | Merge pull request #25177 from y-yagi/fix_class_name | प्रथमेश Sonpatki | 2016-05-28 | 2 | -2/+2 |
| |\ \ | | | | | | | fix incorrect class name [ci skip] | ||||
| | * | | fix incorrect class name [ci skip] | yuuji.yaginuma | 2016-05-28 | 2 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #25176 from kamipo/use_add_index_in_guides | Vipul A M | 2016-05-27 | 1 | -1/+1 |
| |\ \ | | | | | | | Use `add_index` instead of `execute` in guides [ci skip] | ||||
| | * | | Use `add_index` instead of `execute` in guides [ci skip] | Ryuta Kamizono | 2016-05-28 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #25172 from imtayadeway/activejob/after-enqueue-doc | Vipul A M | 2016-05-27 | 1 | -2/+2 |
| |\ \ | | | | | | | [ci skip] Reword doc for around_enqueue callback | ||||
| | * | | [ci skip] Reword doc for around_enqueue callback | Tim Wade | 2016-05-27 | 1 | -2/+2 |
| |/ / | | | | | | | | | | | Taken literally, the documentation suggests that the callback gets called twice (before and after enqueueing). By wording it similarly to that of around_perform this confusion is avoided. | ||||
| * | | Merge pull request #25171 from matkoniecz/cosmetic_updates | Vipul A M | 2016-05-27 | 1 | -1/+1 |
| |\ \ | | | | | | | cometic updates to security guide - fixes #25058 [ci skip] | ||||
| | * | | cometic updates to security guide - fixes #25058 [ci skip] | Mateusz Konieczny | 2016-05-27 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #25160 from kamipo/remove_association_for_table | Rafael França | 2016-05-27 | 1 | -6/+0 |
| |\ \ | | | | | | | Remove unused `association_for_table` private method | ||||
| | * | | Remove unused `association_for_table` private method | Ryuta Kamizono | 2016-05-27 | 1 | -6/+0 |
| | | | | | | | | | | | | | `association_for_table` is unused since 50a8cdf. | ||||
| * | | | Merge pull request #25162 from willnet/fix-guides | प्रथमेश Sonpatki | 2016-05-27 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | [ci skip] Fix ActionCable Guides | ||||
| | * | | | [ci skip] Fix ActionCable Guides | willnet | 2016-05-27 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | Default worker pool size was changed from 100 to 4 at #24376 | ||||
| * | | | Merge pull request #25164 from ↵ | Kasper Timm Hansen | 2016-05-27 | 1 | -2/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | y-yagi/add_missing_as_option_to_deprecation_message add missing `as` to request kwargs of `ActionDispatch::IntegrationTest` | ||||
| | * | | | add missing `as` to request kwargs of `ActionDispatch::IntegrationTest` | yuuji.yaginuma | 2016-05-27 | 1 | -2/+3 |
| | |/ / | | | | | | | | | | Follow up to #21671 | ||||
| * | | | Merge pull request #25157 from maclover7/jm-23930-add-tests | Kasper Timm Hansen | 2016-05-27 | 1 | -0/+8 |
| |\ \ \ | |/ / |/| | | Add test for `delegate_missing_to` where method doesn't exist | ||||
| | * | | Add test for `delegate_missing_to` where method doesn't exist | Jon Moss | 2016-05-26 | 1 | -0/+8 |
| | | | | |||||
| * | | | Merge pull request #25158 from xhpwn/master | Arun Agrawal | 2016-05-27 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | Bash markdown syntax | ||||
| | * | | Bash markdown syntax | Anubhav Saxena | 2016-05-27 | 1 | -1/+1 |
| |/ / | | | | | Added 'sh' for markdown formatting as bash. | ||||
| * | | Merge pull request #25146 from maclover7/fix-25128 | Sean Griffin | 2016-05-26 | 2 | -1/+20 |
| |\ \ | | | | | | | Fix `has_one` `enum` `where` queries | ||||
| | * | | Fix `has_one` `enum` `where` queries | Jon Moss | 2016-05-26 | 2 | -1/+20 |
| | | | | | | | | | | | | | Fixes #25128 | ||||
| * | | | Merge pull request #25153 from jaredbeck/docs_re_assoc_persist | Vipul A M | 2016-05-26 | 1 | -4/+4 |
| |\ \ \ | |/ / |/| | | Docs: Clarify when assoc. methods persist [ci skip] | ||||
| | * | | Docs: Clarify when assoc. methods persist | Jared Beck | 2016-05-26 | 1 | -4/+4 |
| |/ / | | | | | | | | | | | | | Because I can never remember if `collection_singular_ids=` persists or not (it does). [ci skip] | ||||
| * | | autoloading guide: specify autoload paths are set when the app boots [ci skip] | Xavier Noria | 2016-05-26 | 1 | -3/+4 |
| | | | |||||
| * | | Merge pull request #25139 from vipulnsward/revert-bundler-version | Jeremy Daer | 2016-05-25 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | Revert back to a compatible bundler version | ||||
| | * | | Revert back to a compatible bundler version | Vipul A M | 2016-05-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #25138 from ysksn/test_delegation | Rafael França | 2016-05-25 | 1 | -0/+15 |
| |\ \ \ | |/ / |/| | | Add tests for keyword arg to: for Module#delegate | ||||
| | * | | Add tests for keyword arg to: for Module#delegate | Yosuke Kabuto | 2016-05-25 | 1 | -0/+15 |
| | |/ | |||||
| * / | CI: run Action Cable browser tests in Sauce Labs | Jon Moss | 2016-05-25 | 6 | -3/+61 |
| |/ | | | | | | | | Allow failures until test runs are consistently stable, not hanging. Closes #24943. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com> | ||||
| * | Merge pull request #25134 from malept/consistent-hash-examples | Jon Moss | 2016-05-24 | 1 | -6/+6 |
| |\ | | | | | Normalize whitespace for Hash#compact documentation | ||||
| | * | Normalize whitespace for Hash#compact documentation [ci skip] | Mark Lee | 2016-05-24 | 1 | -6/+6 |
| |/ | | | | This is a similar change that occurred for Hash#except in #21087. | ||||
| * | Don't delegate to private methods of the targer | Rafael Mendonça França | 2016-05-24 | 2 | -1/+19 |
| | | | | | And make sure that it doesn't even try to call the method in the target. | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |