| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #4918 from scottwb/fix-single-accept-with-q | José Valim | 2012-02-07 | 2 | -1/+9 |
|\ |
|
| * | Correctly handle single media with q value. Fixes #736. | Scott W. Bradley | 2012-02-06 | 1 | -1/+3 |
| * | Failing test case that shows issue #736 should still be open. | Scott W. Bradley | 2012-02-06 | 1 | -0/+6 |
* | | Merge pull request #4924 from rafaelfranca/fix-asset_tag | José Valim | 2012-02-07 | 2 | -16/+16 |
|\ \
| |/
|/| |
|
| * | Always use content_tag for audio/video tag | Rafael Mendonça França | 2012-02-07 | 2 | -16/+16 |
|/ |
|
* | adding a comment for myself | Aaron Patterson | 2012-02-06 | 2 | -8/+9 |
* | delegate attribute typecasting to the column | Aaron Patterson | 2012-02-06 | 2 | -16/+17 |
* | pg supports real booleans, so handle the case when `true` is returned | Aaron Patterson | 2012-02-06 | 1 | -2/+5 |
* | let automatic EXPLAIN ignore CACHE notifications | Xavier Noria | 2012-02-03 | 2 | -1/+52 |
* | Merge pull request #4905 from herimedia/to-infinity-and-beyond | Aaron Patterson | 2012-02-06 | 2 | -2/+20 |
|\ |
|
| * | To infinity… and beyond! | Niels Ganser | 2012-02-06 | 2 | -2/+20 |
* | | Merge pull request #4910 from sskirby/fixes_regression_in_postgres_template_s... | Aaron Patterson | 2012-02-06 | 1 | -1/+1 |
|\ \ |
|
| * | | prevents the database.yml template option from being passed to PGConn | Sean Kirby | 2012-02-06 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #4908 from kennyj/fix_3864 | José Valim | 2012-02-06 | 2 | -1/+34 |
|\ \
| |/
|/| |
|
| * | Fix url_for method's behavior when it is called with :controller option which... | kennyj | 2012-02-07 | 2 | -1/+34 |
|/ |
|
* | Merge pull request #4900 from lest/patch-1 | José Valim | 2012-02-05 | 1 | -0/+2 |
|\ |
|
| * | allow mass-assign version attribute in AR::SchemaMigration | Sergey Nartimov | 2012-02-06 | 1 | -0/+2 |
* | | Note the ways #match may be called | Jeremy Kemper | 2012-02-05 | 1 | -0/+3 |
* | | Revert "Deprecated multi args to http route methods" | Jeremy Kemper | 2012-02-05 | 2 | -13/+1 |
|/ |
|
* | Get ActiveRecord::TestCase back on its feet, despite deprecation. It requires... | Jeremy Kemper | 2012-02-05 | 3 | -92/+68 |
* | Merge pull request #4893 from bcardarella/mark_for_highlight | José Valim | 2012-02-05 | 3 | -16/+19 |
|\ |
|
| * | Highlight defaults to HTML5 `mark` element | Brian Cardarella | 2012-02-05 | 3 | -16/+19 |
* | | Merge pull request #4881 from al2o3cr/compatible_json_errors | Jeremy Kemper | 2012-02-05 | 3 | -6/+83 |
|\ \
| |/
|/| |
|
| * | add handling for backwards-compatibility and update documentation | Matt Jones | 2012-02-04 | 3 | -4/+67 |
| * | Merge remote-tracking branch 'odorcicd/fix_activeresource_json_errors' into c... | Matt Jones | 2012-02-04 | 2 | -4/+18 |
| |\ |
|
| | * | Fix ActiveResource JSON error parser and incorrect tests | Denis Odorcic | 2011-09-16 | 2 | -4/+18 |
* | | | Merge pull request #4892 from bkzl/master | José Valim | 2012-02-05 | 2 | -12/+14 |
|\ \ \ |
|
| * | | | Display annotations from .coffee files in `rake notes` | Bartlomiej Kozal | 2012-02-05 | 2 | -12/+14 |
|/ / / |
|
* | | | Merge pull request #4891 from kennyj/fix_4883 | Santiago Pastorino | 2012-02-05 | 2 | -3/+4 |
|\ \ \ |
|
| * | | | Optional start_day argument for Time#all_week. | kennyj | 2012-02-06 | 2 | -3/+4 |
|/ / / |
|
* | | | Merge pull request #4888 from kennyj/fix_2982 | José Valim | 2012-02-05 | 2 | -1/+7 |
|\ \ \ |
|
| * | | | Add testcase for non english filename. Related to #2982. | kennyj | 2012-02-05 | 2 | -1/+7 |
* | | | | Merge pull request #4886 from bogdan/callbacks_cleanup | José Valim | 2012-02-05 | 1 | -17/+13 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | AS::Callbacks: remove unused code | Bogdan Gusiev | 2012-02-05 | 1 | -17/+13 |
|/ / / |
|
* | | | Merge pull request #4875 from sikachu/master-asset-url | José Valim | 2012-02-05 | 6 | -2/+203 |
|\ \ \ |
|
| * | | | Add *_url helpers to get the full assets URL | Prem Sichanugrist | 2012-02-04 | 6 | -2/+203 |
|/ / / |
|
* | | | Clean up a bit default_response handling and cache format negotiation. | José Valim | 2012-02-04 | 2 | -19/+17 |
* | | | Merge pull request #4869 from sikachu/master-responder-fix | José Valim | 2012-02-04 | 4 | -8/+60 |
|\ \ \ |
|
| * | | | Fix override API response bug in respond_with | Prem Sichanugrist | 2012-02-03 | 4 | -8/+60 |
| |/ / |
|
* | | | Merge pull request #4879 from kennyj/fix_4873 | José Valim | 2012-02-04 | 2 | -2/+9 |
|\ \ \ |
|
| * | | | Fix GH #4873. Allow swapping middleware of same class | kennyj | 2012-02-04 | 2 | -2/+9 |
|/ / / |
|
* | | | remove unasserted line in test | Vijay Dev | 2012-02-04 | 1 | -1/+0 |
* | | | make the ONLY env variable used in guides generation work with kindle guides | Vijay Dev | 2012-02-04 | 1 | -1/+1 |
* | | | Merge pull request #4877 from bogdan/drop_per_key | José Valim | 2012-02-04 | 4 | -49/+46 |
|\ \ \ |
|
| * | | | AS::Callbacks: rip out per_key option. | Bogdan Gusiev | 2012-02-04 | 4 | -49/+46 |
* | | | | mention how to generate guides for the Kindle [ci skip] | Vijay Dev | 2012-02-04 | 1 | -2/+14 |
* | | | | document config.active_record.dependent_restrict_raises in the configuring gu... | Vijay Dev | 2012-02-04 | 1 | -0/+2 |
|/ / / |
|
* | | | Merge pull request #4866 from bogdan/terminate_after_callbacks | José Valim | 2012-02-04 | 5 | -7/+12 |
|\ \ \
| |/ /
|/| | |
|
| * | | AS::Callbacks: :skip_after_callbacks_if_terminated option | Bogdan Gusiev | 2012-02-03 | 5 | -7/+12 |
* | | | Merge pull request #4865 from bogdan/deprecate_per_key | José Valim | 2012-02-03 | 2 | -8/+6 |
|\ \ \ |
|