aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* moved attribute translation to an objectAaron Patterson2012-02-072-16/+38
* moved most of the evald code in to regular ruby codeAaron Patterson2012-02-073-17/+32
* copy the columns hash to the active record instances, typecast using columns ...Aaron Patterson2012-02-074-36/+66
* always flush all logs. fixes #4277Aaron Patterson2012-02-071-1/+1
* no need to check for this constantXavier Noria2012-02-071-1/+1
* Merge pull request #4928 from rmm5t/fix_force_ssl_redirect_with_params_masterJosé Valim2012-02-074-0/+24
|\
| * Added unit test to cover changes to RouteSet.url_forRyan McGeary2012-02-071-0/+16
| * Fixed force_ssl redirects to include original query paramsRyan McGeary2012-02-073-0/+8
|/
* Merge pull request #2490 from gsterndale/x_forwarded_for_orderJosé Valim2012-02-072-5/+5
|\
| * The first IP address in the X-Forwarded-For header is the originating IPGreg Sterndale2012-02-072-5/+5
* | Fix that failed tests should exit with a nonzero error code.Jeremy Kemper2012-02-072-31/+17
* | Merge pull request #2632 from gsterndale/replace_trusted_proxiesJosé Valim2012-02-072-6/+19
|\ \
| * | Trusted proxies is replaced with a Regexp or appended to with a StringGreg Sterndale2012-02-072-6/+19
| |/
* | Merge pull request #4926 from iblue/masterXavier Noria2012-02-071-1/+2
|\ \
| * | Fixed the documenation for 'to_xml'Markus Fenske2012-02-071-1/+2
| |/
* | Merge pull request #4918 from scottwb/fix-single-accept-with-qJosé Valim2012-02-072-1/+9
|\ \ | |/ |/|
| * Correctly handle single media with q value. Fixes #736.Scott W. Bradley2012-02-061-1/+3
| * Failing test case that shows issue #736 should still be open.Scott W. Bradley2012-02-061-0/+6
* | Merge pull request #4924 from rafaelfranca/fix-asset_tagJosé Valim2012-02-072-16/+16
|\ \ | |/ |/|
| * Always use content_tag for audio/video tagRafael Mendonça França2012-02-072-16/+16
|/
* 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
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 07:02:09 +0000