| Commit message (Expand) | Author | Age | Files | Lines |
* | backporting #4918 to 3.2 stable; adding extra test for accept header given by... | Aditya Sanghi | 2012-02-17 | 2 | -1/+15 |
* | Merge pull request #5049 from fabioyamate/master | José Valim | 2012-02-15 | 2 | -3/+10 |
* | adding tests to document behavior for #4817 | Aaron Patterson | 2012-02-14 | 1 | -0/+26 |
* | Rack body respond to each and not to join | Santiago Pastorino | 2012-02-14 | 2 | -2/+16 |
* | Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo | José Valim | 2012-02-14 | 1 | -1/+4 |
* | Fix deprecation warning in AS::Concern. | José Valim | 2012-02-13 | 1 | -1/+1 |
* | Fix that failed tests should exit with a nonzero error code. | Jeremy Kemper | 2012-02-10 | 2 | -31/+17 |
* | Merge pull request #4988 from kennyj/fix_4720-3 | Aaron Patterson | 2012-02-10 | 2 | -0/+31 |
* | Merge pull request #4941 from rafaelfranca/fix-build | José Valim | 2012-02-08 | 1 | -3/+3 |
|\ |
|
| * | Use real table and columns for index test | Rafael Mendonça França | 2012-02-08 | 1 | -3/+3 |
|/ |
|
* | Push proper test changes for previous commit conflicts. | José Valim | 2012-02-08 | 1 | -2/+4 |
* | Handle nil in add_index :length option in MySQL | Paul Sadauskas | 2012-02-08 | 2 | -1/+6 |
* | Fix attribute_before_type_cast for serialized attributes. Fixes #4837. | Jon Leighton | 2012-02-07 | 3 | -0/+25 |
* | always flush all logs. fixes #4277 | Aaron Patterson | 2012-02-07 | 1 | -1/+1 |
* | no need to check for this constant | Xavier Noria | 2012-02-07 | 1 | -1/+1 |
* | Merge pull request #4916 from rmm5t/fix_force_ssl_redirect_with_params | José Valim | 2012-02-07 | 4 | -0/+24 |
|\ |
|
| * | Added unit test to cover changes to RouteSet.url_for | Ryan McGeary | 2012-02-07 | 1 | -0/+16 |
| * | Fixed force_ssl redirects to include original query params | Ryan McGeary | 2012-02-06 | 3 | -0/+8 |
* | | Fixed the documenation for 'to_xml' | Markus Fenske | 2012-02-07 | 1 | -1/+2 |
* | | Merge pull request #4920 from guilleiguaran/revert-gemfile-edge | José Valim | 2012-02-07 | 3 | -4/+4 |
|\ \ |
|
| * | | --edge option should generate app with rails 3-2-stable | Guillermo Iguaran | 2012-02-07 | 3 | -4/+4 |
|/ / |
|
* / | let automatic EXPLAIN ignore CACHE notifications | Xavier Noria | 2012-02-03 | 2 | -1/+52 |
|/ |
|
* | Merge pull request #4912 from guilleiguaran/fix-edge-gemfile | Aaron Patterson | 2012-02-06 | 1 | -2/+2 |
|\ |
|
| * | Add branch to sass-rails and coffee-rails for apps generated with --dev or --... | Guillermo Iguaran | 2012-02-06 | 1 | -2/+2 |
|/ |
|
* | Merge pull request #4908 from kennyj/fix_3864 | José Valim | 2012-02-06 | 2 | -1/+34 |
* | Merge pull request #4890 from kennyj/improvement_4883 | Santiago Pastorino | 2012-02-05 | 2 | -3/+4 |
|\ |
|
| * | GH #4883. Optional start_day argument for Time#all_week | kennyj | 2012-02-05 | 2 | -3/+4 |
|/ |
|
* | Clean up a bit default_response handling and cache format negotiation. | José Valim | 2012-02-04 | 2 | -19/+17 |
* | Merge pull request #4870 from sikachu/3-2-stable-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 |
* | | Merge pull request #4868 from skult/3-2-stable | Aaron Patterson | 2012-02-03 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | Fix Issue #4819 | densya203 | 2012-02-04 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption | Aaron Patterson | 2012-02-02 | 3 | -17/+3 |
* | Merge pull request #4543 from jdelStrother/find_or_init | Jon Leighton | 2012-02-01 | 2 | -2/+13 |
* | Merge pull request #4827 from sikachu/3-2-stable-fix-plugin-new | José Valim | 2012-02-01 | 2 | -3/+7 |
|\ |
|
| * | Fix plugin_new test failure from c8c84397 | Prem Sichanugrist | 2012-02-01 | 2 | -3/+7 |
|/ |
|
* | Merge pull request #4822 from carlosantoniodasilva/strict-validation-3-2 | José Valim | 2012-02-01 | 3 | -11/+19 |
|\ |
|
| * | Generate strict validation error messages with attribute name | Carlos Antonio da Silva | 2012-02-01 | 3 | -11/+19 |
* | | Merge pull request #4815 from kennyj/fix_4749 | Santiago Pastorino | 2012-02-01 | 2 | -2/+7 |
|\ \ |
|
| * | | Fix GH #4749. Remove branch options, because edge is not 3-2-stable. | kennyj | 2012-02-01 | 2 | -2/+7 |
* | | | Merge pull request #4811 from rafaelfranca/3-2-stable-fix | Santiago Pastorino | 2012-01-31 | 3 | -13/+13 |
|\| | |
|
| * | | Fix broken tests added by 85c724d59 | Rafael Mendonça França | 2012-01-31 | 3 | -13/+13 |
|/ / |
|
* | | Improve deprecation message | Jon Leighton | 2012-01-31 | 1 | -7/+17 |
* | | Merge pull request #4735 from arton/master | Aaron Patterson | 2012-01-31 | 1 | -1/+5 |
* | | Merge pull request #4779 from bsodmike/bsodmike-3-2-stable | Aaron Patterson | 2012-01-31 | 1 | -1/+1 |
|\ \ |
|
| * | | clarification to prevent confusing newbies; Passenger/Unicorn are app servers... | Michael de Silva | 2012-01-31 | 1 | -1/+1 |
* | | | Merge pull request #4793 from kennyj/fix_4760 | José Valim | 2012-01-31 | 2 | -2/+11 |
|\ \ \ |
|
| * | | | Fix GH #4760. A Block was not evaluated. | kennyj | 2012-01-31 | 2 | -2/+11 |
* | | | | Merge pull request #4783 from gregolsen/ids_reader_fix | Jon Leighton | 2012-01-31 | 3 | -1/+6 |