aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Failing test case that shows issue #736 should still be open.Scott W. Bradley2012-02-061-0/+6
* adding a comment for myselfAaron Patterson2012-02-062-8/+9
* delegate attribute typecasting to the columnAaron Patterson2012-02-062-16/+17
* pg supports real booleans, so handle the case when `true` is returnedAaron Patterson2012-02-061-2/+5
* let automatic EXPLAIN ignore CACHE notificationsXavier Noria2012-02-032-1/+52
* Merge pull request #4905 from herimedia/to-infinity-and-beyondAaron Patterson2012-02-062-2/+20
|\
| * To infinity… and beyond!Niels Ganser2012-02-062-2/+20
* | Merge pull request #4910 from sskirby/fixes_regression_in_postgres_template_s...Aaron Patterson2012-02-061-1/+1
|\ \
| * | prevents the database.yml template option from being passed to PGConnSean Kirby2012-02-061-1/+1
|/ /
* | Merge pull request #4908 from kennyj/fix_3864José Valim2012-02-062-1/+34
|\ \ | |/ |/|
| * Fix url_for method's behavior when it is called with :controller option which...kennyj2012-02-072-1/+34
|/
* Merge pull request #4900 from lest/patch-1José Valim2012-02-051-0/+2
|\
| * allow mass-assign version attribute in AR::SchemaMigrationSergey Nartimov2012-02-061-0/+2
* | Note the ways #match may be calledJeremy Kemper2012-02-051-0/+3
* | Revert "Deprecated multi args to http route methods"Jeremy Kemper2012-02-052-13/+1
|/
* Get ActiveRecord::TestCase back on its feet, despite deprecation. It requires...Jeremy Kemper2012-02-053-92/+68
* Merge pull request #4893 from bcardarella/mark_for_highlightJosé Valim2012-02-053-16/+19
|\
| * Highlight defaults to HTML5 `mark` elementBrian Cardarella2012-02-053-16/+19
* | Merge pull request #4881 from al2o3cr/compatible_json_errorsJeremy Kemper2012-02-053-6/+83
|\ \ | |/ |/|
| * add handling for backwards-compatibility and update documentationMatt Jones2012-02-043-4/+67
| * Merge remote-tracking branch 'odorcicd/fix_activeresource_json_errors' into c...Matt Jones2012-02-042-4/+18
| |\
| | * Fix ActiveResource JSON error parser and incorrect testsDenis Odorcic2011-09-162-4/+18
* | | Merge pull request #4892 from bkzl/masterJosé Valim2012-02-052-12/+14
|\ \ \
| * | | Display annotations from .coffee files in `rake notes`Bartlomiej Kozal2012-02-052-12/+14
|/ / /
* | | Merge pull request #4891 from kennyj/fix_4883Santiago Pastorino2012-02-052-3/+4
|\ \ \
| * | | Optional start_day argument for Time#all_week.kennyj2012-02-062-3/+4
|/ / /
* | | Merge pull request #4888 from kennyj/fix_2982José Valim2012-02-052-1/+7
|\ \ \
| * | | Add testcase for non english filename. Related to #2982.kennyj2012-02-052-1/+7
* | | | Merge pull request #4886 from bogdan/callbacks_cleanupJosé Valim2012-02-051-17/+13
|\ \ \ \ | |/ / / |/| | |
| * | | AS::Callbacks: remove unused codeBogdan Gusiev2012-02-051-17/+13
|/ / /
* | | Merge pull request #4875 from sikachu/master-asset-urlJosé Valim2012-02-056-2/+203
|\ \ \
| * | | Add *_url helpers to get the full assets URLPrem Sichanugrist2012-02-046-2/+203
|/ / /
* | | Clean up a bit default_response handling and cache format negotiation.José Valim2012-02-042-19/+17
* | | Merge pull request #4869 from sikachu/master-responder-fixJosé Valim2012-02-044-8/+60
|\ \ \
| * | | Fix override API response bug in respond_withPrem Sichanugrist2012-02-034-8/+60
| |/ /
* | | Merge pull request #4879 from kennyj/fix_4873José Valim2012-02-042-2/+9
|\ \ \
| * | | Fix GH #4873. Allow swapping middleware of same classkennyj2012-02-042-2/+9
|/ / /
* | | remove unasserted line in testVijay Dev2012-02-041-1/+0
* | | make the ONLY env variable used in guides generation work with kindle guidesVijay Dev2012-02-041-1/+1
* | | Merge pull request #4877 from bogdan/drop_per_keyJosé Valim2012-02-044-49/+46
|\ \ \
| * | | AS::Callbacks: rip out per_key option.Bogdan Gusiev2012-02-044-49/+46
* | | | mention how to generate guides for the Kindle [ci skip]Vijay Dev2012-02-041-2/+14
* | | | document config.active_record.dependent_restrict_raises in the configuring gu...Vijay Dev2012-02-041-0/+2
|/ / /
* | | Merge pull request #4866 from bogdan/terminate_after_callbacksJosé Valim2012-02-045-7/+12
|\ \ \ | |/ / |/| |
| * | AS::Callbacks: :skip_after_callbacks_if_terminated optionBogdan Gusiev2012-02-035-7/+12
* | | Merge pull request #4865 from bogdan/deprecate_per_keyJosé Valim2012-02-032-8/+6
|\ \ \
| * | | AC::Callbacks: remove usage of :per_key option from filtersBogdan Gusiev2012-02-032-8/+6
| |/ /
* | | Merge pull request #4863 from norman/unicodeVijay Dev2012-02-031-0/+2
|\ \ \
| * | | Added note about new Unicode version.Norman Clarke2012-02-031-0/+2
* | | | Merge pull request #4862 from norman/unicodeJosé Valim2012-02-033-1/+1
|\| | |