| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge pull request #17076 from yuki24/write-doc-for-rescue-responses | Zachary Scott | 2014-09-26 | 1 | -0/+23 | |
| |\ \ \ | | | | | | | | | Add documentation about rescue_responses in Configuring [ci skip] | |||||
| | * | | | Add documentation about `config.action_dispatch.rescue_responses` | Yuki Nishijima | 2014-09-26 | 1 | -0/+23 | |
| |/ / / | | | | | | | | | | [ci skip] | |||||
| * | | | Preparing for 4.2.0.beta2 release | Rafael Mendonça França | 2014-09-26 | 10 | -10/+10 | |
| | | | | ||||||
| * | | | Merge pull request #17071 from claudiob/don-t-require-action-dispatch-twice | Rafael Mendonça França | 2014-09-26 | 1 | -2/+0 | |
| |\ \ \ | | | | | | | | | Don’t require already required modules | |||||
| | * | | | Don’t require already required modules | claudiofullscreen | 2014-09-26 | 1 | -2/+0 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | abstract_unit.rb requires `action_controller` which [already includes the following lines of code](https://github.com/rails/rails/blob/64fcdce1d3a6a8768ab17f3be144270456814f82/actionpack/lib/action_controller.rb#L2L3): ```ruby require 'abstract_controller' require 'action_dispatch' ``` | |||||
| * | | | Merge pull request #17070 from felipecvo/master | Rafael Mendonça França | 2014-09-26 | 1 | -3/+4 | |
| |\ \ \ | | | | | | | | | Add +variants to ActionView::FileSystemResolver documentation. | |||||
| | * | | | Add +variants to ActionView::FileSystemResolver documentation. | Felipe Oliveira | 2014-09-26 | 1 | -3/+4 | |
| |/ / / | ||||||
| * | | | Revert "Merge pull request #16966 from why-el/symbolize-path-params" | Rafael Mendonça França | 2014-09-25 | 2 | -9/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9d05d6de52871e57bfbf54a60de005e8a5f5b0e4, reversing changes made to 0863c9248fd47a15e88e05ce4fcd80966684c0e3. The change in the behaviour reported at #16958 doesn't exist since 4.0 and 4.1 works in the same way | |||||
| * | | | Merge pull request #17061 from bronzle/remove_extra_# | Rafael Mendonça França | 2014-09-25 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | remove extra # in css | |||||
| | * | | | remove extra # in css | Byron Bischoff | 2014-09-25 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge pull request #17059 from bronzle/remove_threadsafe_from_guides | Abdelkader Boudih | 2014-09-25 | 1 | -2/+2 | |
| |\ \ \ \ | |/ / / |/| | | | [ci skip] Remove reference to config.threadsafe! in guides/configuring.md | |||||
| | * | | | [ci skip] Remove reference to config.threadsafe! in guides/configuriing.md | Byron Bischoff | 2014-09-25 | 1 | -2/+2 | |
| |/ / / | ||||||
| * | | | Merge pull request #16966 from why-el/symbolize-path-params | Rafael Mendonça França | 2014-09-25 | 2 | -0/+9 | |
| |\ \ \ | | | | | | | | | | | | | Ensure named path params are symbols (Fixes #16958) | |||||
| | * | | | Ensure named path params are symbols (Fixes #16958) | Mohamed Wael Khobalatte | 2014-09-25 | 2 | -0/+9 | |
| |/ / / | ||||||
| * | | | No need CHANGLOG entry for a bug in a non released version | Rafael Mendonça França | 2014-09-25 | 1 | -7/+0 | |
| | | | | | | | | | | | | | [ci skip] | |||||
| * | | | Keep the original implementation to not having to allocate new objects | Rafael Mendonça França | 2014-09-25 | 1 | -2/+15 | |
| | | | | ||||||
| * | | | Merge pull request #17058 from eval/issue-17057 | Rafael Mendonça França | 2014-09-25 | 3 | -18/+19 | |
| |\ \ \ | | | | | | | | | | | | | Remove internal options from query string of paths | |||||
| | * | | | Remove internal options from query string of paths | Gert Goet | 2014-09-25 | 3 | -18/+19 | |
| | | | | | | | | | | | | | | | | | Fixes #17057 | |||||
| * | | | | No need to install the deprecated_sanitizer gem | Rafael Mendonça França | 2014-09-25 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | It is not being used in our tests | |||||
| * | | | | rails-html-sanitizer is now the default | Rafael Mendonça França | 2014-09-25 | 3 | -13/+6 | |
| | | | | | | | | | | | | | | | | | Also add to upgrading guide a notice about the deprecated sanitizers | |||||
| * | | | | Remove unused code | Rafael Mendonça França | 2014-09-25 | 2 | -23/+1 | |
| | | | | | ||||||
| * | | | | :nail_care: the CSS | Rafael Mendonça França | 2014-09-25 | 1 | -7/+18 | |
| | | | | | ||||||
| * | | | | Merge pull request #17024 from buddhamagnet/amend-welcome-page | Rafael Mendonça França | 2014-09-25 | 2 | -14/+11 | |
| |\ \ \ \ | | | | | | | | | | | Amend welcome page | |||||
| | * | | | | Improve welcome page css and table cell aignments. | buddhamagnet | 2014-09-25 | 2 | -14/+11 | |
| | | | | | | ||||||
| * | | | | | Fix string/gid collision in job arguments | Jeremy Kemper | 2014-09-25 | 2 | -6/+38 | |
| | | | | | | | | | | | | | | | | | | | | | Serialize Global IDs as special objects, distinguishable from Strings | |||||
| * | | | | | Fix actionpack test cases broken by #16888 | Godfrey Chan | 2014-09-26 | 2 | -29/+9 | |
| | | | | | | ||||||
| * | | | | | Revert "Revert "Merge pull request #16888 from jejacks0n/render_template"" | Godfrey Chan | 2014-09-26 | 4 | -20/+27 | |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 585e75696b31395aee895e5366e331c07c3f5ee1. | |||||
| * | | | | | Use released rails-html-sanitizer and rails-deprecated_sanitizer | Godfrey Chan | 2014-09-26 | 4 | -7/+5 | |
| | | | | | | ||||||
| * | | | | | Use release web-console | Rafael Mendonça França | 2014-09-25 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Use released rails-dom-testing | Rafael Mendonça França | 2014-09-25 | 4 | -5/+3 | |
| | |/ / / |/| | | | ||||||
| * | | | | Merge pull request #17051 from jwworth/task/fix_typo | Rafael Mendonça França | 2014-09-24 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | Fix typo | |||||
| | * | | | | Fix typo | Jake Worth | 2014-09-24 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #17042 from DanOlson/remove-skip-action-view | Rafael Mendonça França | 2014-09-24 | 5 | -11/+9 | |
| |\ \ \ \ | | | | | | | | | | | Remove --skip-action-view option from application generator | |||||
| | * | | | | Remove --skip-action-view option from application generator | Dan Olson | 2014-09-24 | 5 | -11/+9 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #17020 from Sirupsen/ar-override-rack-test | Aaron Patterson | 2014-09-23 | 3 | -1/+14 | |
| |\ \ \ \ | | | | | | | | | | | activerecord/connection_pool: honor overidden rack.test in tests | |||||
| | * | | | | ar/connection_pool: honor overriden rack.test in middleware | Simon Eskildsen | 2014-09-23 | 3 | -1/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Honoring an overidden `rack.test` allows testing closed connection between multiple requests. This is useful if you're working on database resiliency, to ensure the connection is in the expected state from one request to another on the same worker. | |||||
| * | | | | | Merge pull request #17032 from tgxworld/update_contributing_guide | Arthur Nogueira Neves | 2014-09-23 | 1 | -5/+5 | |
| |\ \ \ \ \ | | | | | | | | | | | | | [CI SKIP] Improve force push note. | |||||
| | * | | | | | [CI SKIP] Improve force push note. | Guo Xiang Tan | 2014-09-23 | 1 | -5/+5 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #17029 from grk/fix-loading-fixtures-in-engine-tests | Santiago Pastorino | 2014-09-23 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix loading fixtures in engine tests | |||||
| | * | | | | | Fix loading fixtures in engine tests | Grzesiek Kolodziejczyk | 2014-09-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixture_path is a class attribute of ActiveSupport::TestCase, so ActiveSupport::TestCase.method_defined?(:fixture_path=) would always return false. This should fix #4971 | |||||
| * | | | | | | Merge pull request #17026 from ↵ | Richard Schneeman | 2014-09-23 | 1 | -0/+17 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | prathamesh-sonpatki/mention-updating-pull-requests Added note about updating pull requests by force push | |||||
| | * | | | | | Added note about updating pull requests by force push | Prathamesh Sonpatki | 2014-09-23 | 1 | -0/+17 | |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | - Added note about force pushing same branch to update a existing pull request instead of opening new one in contributing guide. - [ci skip] | |||||
| * | | | | | Merge pull request #17005 from y-yagi/fix_aj_test_helper | Yves Senn | 2014-09-23 | 2 | -2/+4 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | add message to `assert` in `assert_enqueued_with` | |||||
| | * | | | | | add message to `assert` in `assert_enqueued_with` | yuuji.yaginuma | 2014-09-23 | 2 | -2/+4 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #17022 from prathamesh-sonpatki/test-for-validate-message | Yves Senn | 2014-09-23 | 1 | -1/+3 | |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Added test for exception message for validate method | |||||
| | * | | | | | Added test for exception message for validate method | Prathamesh Sonpatki | 2014-09-23 | 1 | -1/+3 | |
| |/ / / / / | | | | | | | | | | | | | | | | - Test case for https://github.com/rails/rails/pull/16851 | |||||
| * | | | | | Merge pull request #17018 from prathamesh-sonpatki/tenderlove | Abdelkader Boudih | 2014-09-23 | 1 | -1/+5 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Update changelog with tenderlove's entry | |||||
| | * | | | | | Update changelog with tenderlove's entry | Prathamesh Sonpatki | 2014-09-23 | 1 | -1/+5 | |
| |/ / / / / | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | add a truncate method to the connection | Aaron Patterson | 2014-09-22 | 6 | -0/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it doesn't work on SQLite3 since it doesn't support truncate, but that's OK. If you call truncate on the connection, you're now bound to that database (same as if you use hstore or any other db specific feature). | |||||
| * | | | | | Merge pull request #17012 from ↵ | Rafael Mendonça França | 2014-09-22 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | petedmarsh/clarify-association-primary-key-option-documentation Clarify the documentation of the primary_key option for associations | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |