aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Push proper test changes for previous commit conflicts.José Valim2012-02-081-2/+4
* Handle nil in add_index :length option in MySQLPaul Sadauskas2012-02-082-1/+6
* Fix attribute_before_type_cast for serialized attributes. Fixes #4837.Jon Leighton2012-02-073-0/+25
* 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 #4916 from rmm5t/fix_force_ssl_redirect_with_paramsJosé 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-063-0/+8
* | Fixed the documenation for 'to_xml'Markus Fenske2012-02-071-1/+2
* | Merge pull request #4920 from guilleiguaran/revert-gemfile-edgeJosé Valim2012-02-073-4/+4
|\ \
| * | --edge option should generate app with rails 3-2-stableGuillermo Iguaran2012-02-073-4/+4
|/ /
* / let automatic EXPLAIN ignore CACHE notificationsXavier Noria2012-02-032-1/+52
|/
* Merge pull request #4912 from guilleiguaran/fix-edge-gemfileAaron Patterson2012-02-061-2/+2
|\
| * Add branch to sass-rails and coffee-rails for apps generated with --dev or --...Guillermo Iguaran2012-02-061-2/+2
|/
* Merge pull request #4908 from kennyj/fix_3864José Valim2012-02-062-1/+34
* Merge pull request #4890 from kennyj/improvement_4883Santiago Pastorino2012-02-052-3/+4
|\
| * GH #4883. Optional start_day argument for Time#all_weekkennyj2012-02-052-3/+4
|/
* Clean up a bit default_response handling and cache format negotiation.José Valim2012-02-042-19/+17
* Merge pull request #4870 from sikachu/3-2-stable-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
* | Merge pull request #4868 from skult/3-2-stableAaron Patterson2012-02-031-1/+1
|\ \ | |/ |/|
| * Fix Issue #4819densya2032012-02-041-1/+1
|/
* Merge pull request #4809 from cfeist/feist-sqlite-binary-corruptionAaron Patterson2012-02-023-17/+3
* Merge pull request #4543 from jdelStrother/find_or_initJon Leighton2012-02-012-2/+13
* Merge pull request #4827 from sikachu/3-2-stable-fix-plugin-newJosé Valim2012-02-012-3/+7
|\
| * Fix plugin_new test failure from c8c84397Prem Sichanugrist2012-02-012-3/+7
|/
* Merge pull request #4822 from carlosantoniodasilva/strict-validation-3-2José Valim2012-02-013-11/+19
|\
| * Generate strict validation error messages with attribute nameCarlos Antonio da Silva2012-02-013-11/+19
* | Merge pull request #4815 from kennyj/fix_4749Santiago Pastorino2012-02-012-2/+7
|\ \
| * | Fix GH #4749. Remove branch options, because edge is not 3-2-stable.kennyj2012-02-012-2/+7
* | | Merge pull request #4811 from rafaelfranca/3-2-stable-fixSantiago Pastorino2012-01-313-13/+13
|\| |
| * | Fix broken tests added by 85c724d59Rafael Mendonça França2012-01-313-13/+13
|/ /
* | Improve deprecation messageJon Leighton2012-01-311-7/+17
* | Merge pull request #4735 from arton/masterAaron Patterson2012-01-311-1/+5
* | Merge pull request #4779 from bsodmike/bsodmike-3-2-stableAaron Patterson2012-01-311-1/+1
|\ \
| * | clarification to prevent confusing newbies; Passenger/Unicorn are app servers...Michael de Silva2012-01-311-1/+1
* | | Merge pull request #4793 from kennyj/fix_4760José Valim2012-01-312-2/+11
|\ \ \
| * | | Fix GH #4760. A Block was not evaluated.kennyj2012-01-312-2/+11
* | | | Merge pull request #4783 from gregolsen/ids_reader_fixJon Leighton2012-01-313-1/+6
* | | | Merge pull request #4790 from marten/fix-require-deprecation-in-activesupportJosé Valim2012-01-314-0/+7
|\ \ \ \
| * | | | Fix use of Deprecation without requiring active_support/deprecation in whiny nilMarten Veldthuis2012-01-311-0/+2
| * | | | Fix use of Deprecation without requiring active_support/deprecation in messag...Marten Veldthuis2012-01-311-0/+1
| * | | | Fix use of Deprecation without requiring active_support/deprecation in Active...Marten Veldthuis2012-01-311-0/+2
| * | | | Fix use of Deprecation without requiring active_support/deprecation in Active...Marten Veldthuis2012-01-311-0/+2
|/ / / /
* | | | Merge pull request #4786 from lest/patch-2José Valim2012-01-311-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | fix assets testSergey Nartimov2012-01-311-1/+1
|/ / /
* | | Allow writing unknown attributes, but with a deprecation warning. Closes #4583.Jon Leighton2012-01-312-4/+14
* | | Add workaround and deprecation if the inherited hook is not executed. Closes ...Jon Leighton2012-01-312-0/+22
* | | Merge pull request #4763 from kennyj/fix_4754Jon Leighton2012-01-312-1/+17
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 09:53:47 +0000