Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge pull request #15390 from sgrif/sg-property-order | Rafael Mendonça França | 2014-05-28 | 2 | -3/+13 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Maintain column order when overriding existing columns | Sean Griffin | 2014-05-28 | 2 | -3/+13 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #15389 from sgrif/sg-property-inheritance | Rafael Mendonça França | 2014-05-28 | 2 | -5/+26 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Ensure custom properties work correctly with inheritance | Sean Griffin | 2014-05-28 | 2 | -5/+26 | |
* | | | | | | | | Merge pull request #15370 from sgrif/sg-type-namespace | Rafael Mendonça França | 2014-05-28 | 41 | -643/+592 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Move types to the top level `ActiveRecord` namespace | Sean Griffin | 2014-05-27 | 41 | -643/+592 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Upgrading Ruby on Rails guide is no longer WIP [ci skip] | Zachary Scott | 2014-05-28 | 1 | -1/+0 | |
* | | | | | | | | Formatting of content from b1db615 [ci skip] | Zachary Scott | 2014-05-28 | 1 | -3/+7 | |
* | | | | | | | | Merge pull request #15380 from Gaurav2728/gaurav-transaction_isolation_error | Zachary Scott | 2014-05-28 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Initial doc for TransactionIsolationError [ci skip] | Gaurav Sharma | 2014-05-28 | 1 | -0/+3 | |
* | | | | | | | | | Revert "Merge pull request #12778 from etehtsea/rake-default-fix" | Yves Senn | 2014-05-28 | 2 | -5/+1 | |
| |_|/ / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #15386 from zuhao/refactor_actionpack_request_forgery_prot... | Santiago Pastorino | 2014-05-28 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Avoid hardcoded value in teardown. | Zuhao Wan | 2014-05-28 | 1 | -3/+6 | |
* | | | | | | | | | Merge pull request #15387 from sgrif/sg-remove-column-coder | Santiago Pastorino | 2014-05-28 | 2 | -34/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove unused `Column#coder` | Sean Griffin | 2014-05-28 | 2 | -34/+1 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #15388 from zuhao/refactor_actionpack_send_file_test | Santiago Pastorino | 2014-05-28 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Unregister Mime::Type in teardown. | Zuhao Wan | 2014-05-28 | 1 | -2/+6 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #15385 from zuhao/refactor_actionpack_render_other_test | Santiago Pastorino | 2014-05-28 | 1 | -4/+7 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add and remove renderer inside the test to prevent leak. | Zuhao Wan | 2014-05-28 | 1 | -4/+7 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #15383 from zuhao/refactor_actionpack_localized_templates_... | Yves Senn | 2014-05-28 | 1 | -10/+8 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Move I18n.locale setting into setup and teardown. | Zuhao Wan | 2014-05-28 | 1 | -10/+8 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #15381 from zuhao/refactor_actionpack_content_type_test | Yves Senn | 2014-05-28 | 1 | -12/+20 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Add with_default_charset helper. | Zuhao Wan | 2014-05-28 | 1 | -12/+20 | |
|/ / / / / / | ||||||
* / / / / / | pg, keep `hstore` and `json` attributes as `Hash` in @attributes. | Yves Senn | 2014-05-28 | 5 | -2/+39 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #15374 from sgrif/sg-private-properties | Rafael Mendonça França | 2014-05-27 | 12 | -30/+12 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove AR Properties from the public API | Sean Griffin | 2014-05-27 | 12 | -30/+12 | |
* | | | | | | Add CHANGELOG entry for #15269 [ci skip] | Rafael Mendonça França | 2014-05-27 | 1 | -0/+4 | |
* | | | | | | Merge pull request #15269 from arunagw/aa-fixes-8930 | Rafael Mendonça França | 2014-05-27 | 3 | -1/+42 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | rake railties:install:migrations respects the order of railties | Arun Agrawal | 2014-05-27 | 3 | -1/+42 | |
* | | | | | | | Merge pull request #15373 from akshay-vishnoi/test-cases | Rafael Mendonça França | 2014-05-27 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add test case for clear mappings | Akshay Vishnoi | 2014-05-28 | 1 | -0/+10 | |
* | | | | | | | | Deprecate all *_filter callbacks in favor of *_action callbacks | Rafael Mendonça França | 2014-05-27 | 7 | -218/+228 | |
* | | | | | | | | rm dead code | Aaron Patterson | 2014-05-27 | 1 | -5/+0 | |
* | | | | | | | | PARAMETERS_KEY is only used in the request, so move the constant there | Aaron Patterson | 2014-05-27 | 3 | -9/+9 | |
* | | | | | | | | Merge branch 'constraints' | Aaron Patterson | 2014-05-27 | 11 | -75/+85 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | rm reset_parameters because we automatically do it from 9ca4839a | Aaron Patterson | 2014-05-27 | 3 | -9/+0 | |
| * | | | | | | | move path_parameter encoding check to the request object | Aaron Patterson | 2014-05-27 | 3 | -18/+13 | |
| * | | | | | | | dispatcher doesn't need `call` anymore | Aaron Patterson | 2014-05-27 | 1 | -4/+0 | |
| * | | | | | | | call `serve` with the request on dispatchers | Aaron Patterson | 2014-05-27 | 1 | -9/+10 | |
| * | | | | | | | constraints class does not need the request class anymore | Aaron Patterson | 2014-05-27 | 1 | -4/+4 | |
| * | | | | | | | give all endpoints a superclass | Aaron Patterson | 2014-05-27 | 4 | -22/+40 | |
| * | | | | | | | skip the build business if the stack is empty | Aaron Patterson | 2014-05-26 | 1 | -2/+6 | |
| * | | | | | | | stop hardcoding path_parameters and get it from the request | Aaron Patterson | 2014-05-26 | 1 | -1/+2 | |
| * | | | | | | | we do not need to cache rack_app | Aaron Patterson | 2014-05-26 | 1 | -9/+3 | |
| * | | | | | | | a redirect is not a dispatcher by definition, so eliminate test | Aaron Patterson | 2014-05-26 | 1 | -1/+1 | |
| * | | | | | | | push is_a check up to where the Constraints object is allocated | Aaron Patterson | 2014-05-26 | 2 | -6/+11 | |
| * | | | | | | | pass the request object to the application | Aaron Patterson | 2014-05-25 | 3 | -6/+8 | |
| * | | | | | | | pass a request to `matches?` so we can avoid creating excess requests | Aaron Patterson | 2014-05-25 | 2 | -7/+6 | |
| * | | | | | | | nothing is passed to `rack_app` anymore, so rm the params | Aaron Patterson | 2014-05-25 | 1 | -1/+1 | |
| * | | | | | | | one fewer is_a check | Aaron Patterson | 2014-05-25 | 1 | -4/+3 |