Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #4920 from guilleiguaran/revert-gemfile-edge | José Valim | 2012-02-07 | 3 | -4/+4 | |
|\ \ | | | | | | | In Rails 3.2.x --edge generate apps with rails 3-2-stable | |||||
| * | | --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 --edge (3-2-stable) | |||||
| * | Add branch to sass-rails and coffee-rails for apps generated with --dev or ↵ | Guillermo Iguaran | 2012-02-06 | 1 | -2/+2 | |
|/ | | | | --edge options (3.2.x) | |||||
* | Merge pull request #4908 from kennyj/fix_3864 | José Valim | 2012-02-06 | 2 | -1/+34 | |
| | | | | Fix url_for method's behavior. GH #3684. | |||||
* | 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 | |||||
| * | 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 | |||||
| * | Fix override API response bug in respond_with | Prem Sichanugrist | 2012-02-03 | 4 | -8/+60 | |
| | | | | | | | | | | | | | | | | | | | | Default responder was only using the given respond block when user requested for HTML format, or JSON/XML format with valid resource. This fix the responder so that it will use the given block regardless of the validity of the resource. Note that in this case you'll have to check for object's validity by yourself in the controller. Fixes #4796 | |||||
* | | Merge pull request #4879 from kennyj/fix_4873 | José Valim | 2012-02-04 | 2 | -2/+9 | |
| | | | | | | | | Fix GH #4873. Allow swapping same class middleware. | |||||
* | | Merge pull request #4868 from skult/3-2-stable | Aaron Patterson | 2012-02-03 | 1 | -1/+1 | |
|\ \ | |/ |/| | Fix Issue #4819 | |||||
| * | Fix Issue #4819 | densya203 | 2012-02-04 | 1 | -1/+1 | |
|/ | | | | | | 'uninitialized constant ActiveRecord::Deprecation in Rails3.2.1' Just a typo of 'ActiveSupport::...' | |||||
* | Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption | Aaron Patterson | 2012-02-02 | 3 | -17/+3 | |
| | | | | Fix for SQLite binary data corrupter (to master branch) | |||||
* | Merge pull request #4543 from jdelStrother/find_or_init | Jon Leighton | 2012-02-01 | 2 | -2/+13 | |
| | | | | Don't instantiate two objects in collection proxy / find_or_instantiate_by | |||||
* | 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 | |||||
| * | Fix plugin_new test failure from c8c84397 | Prem Sichanugrist | 2012-02-01 | 2 | -3/+7 | |
|/ | | | | | `plugin_new` generator doesn't generate `sass-rails` in the Gemfile, so you can't check for that. | |||||
* | 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 (3-2-stable) | |||||
| * | Generate strict validation error messages with attribute name | Carlos Antonio da Silva | 2012-02-01 | 3 | -11/+19 | |
| | | | | | | | | Backported from master. | |||||
* | | 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. | |||||
| * | | 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 build in 3-2-stable branch | |||||
| * | | 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 | |
| | | | | | | | | Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows | |||||
* | | Merge pull request #4779 from bsodmike/bsodmike-3-2-stable | Aaron Patterson | 2012-01-31 | 1 | -1/+1 | |
|\ \ | | | | | | | Update comment in Gemfile re Unicorn (minor clarification) | |||||
| * | | clarification to prevent confusing newbies; Passenger/Unicorn are app ↵ | Michael de Silva | 2012-01-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | servers, Apache/Nginx are the web servers along with thin a la Heroku etc. | |||||
* | | | Merge pull request #4793 from kennyj/fix_4760 | José Valim | 2012-01-31 | 2 | -2/+11 | |
|\ \ \ | | | | | | | | | [3-2-stable] Fix GH #4760. A Block was not evaluated. | |||||
| * | | | 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 | |
| | | | | | | | | | | | | | | | | ids_reader method fixed, test added to has_many association (for PostgreSQL) | |||||
* | | | | Merge pull request #4790 from marten/fix-require-deprecation-in-activesupport | José Valim | 2012-01-31 | 4 | -0/+7 | |
|\ \ \ \ | | | | | | | | | | | Fix Deprecation usage in ActiveSupport when requiring only parts of AS | |||||
| * | | | | Fix use of Deprecation without requiring active_support/deprecation in whiny nil | Marten Veldthuis | 2012-01-31 | 1 | -0/+2 | |
| | | | | | ||||||
| * | | | | Fix use of Deprecation without requiring active_support/deprecation in ↵ | Marten Veldthuis | 2012-01-31 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | message verifier | |||||
| * | | | | Fix use of Deprecation without requiring active_support/deprecation in ↵ | Marten Veldthuis | 2012-01-31 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | ActiveSupport::Concern in Base64 | |||||
| * | | | | Fix use of Deprecation without requiring active_support/deprecation in ↵ | Marten Veldthuis | 2012-01-31 | 1 | -0/+2 | |
|/ / / / | | | | | | | | | | | | | ActiveSupport::Concern | |||||
* | | | | Merge pull request #4786 from lest/patch-2 | José Valim | 2012-01-31 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | fix assets test in 3-2-stable | |||||
| * | | | fix assets test | Sergey Nartimov | 2012-01-31 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Allow writing unknown attributes, but with a deprecation warning. Closes #4583. | Jon Leighton | 2012-01-31 | 2 | -4/+14 | |
| | | | ||||||
* | | | Add workaround and deprecation if the inherited hook is not executed. Closes ↵ | Jon Leighton | 2012-01-31 | 2 | -0/+22 | |
| | | | | | | | | | | | | #4757. | |||||
* | | | Merge pull request #4763 from kennyj/fix_4754 | Jon Leighton | 2012-01-31 | 2 | -1/+17 | |
|/ / | | | | | | | [MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES | |||||
* | | query cache instrumentation should included the bindings in the payload ↵ | Xavier Noria | 2012-01-30 | 1 | -1/+1 | |
| | | | | | | | | [closes #4750] | |||||
* | | fix typo [ci skip] | Vijay Dev | 2012-01-30 | 1 | -1/+1 | |
| | | ||||||
* | | Inline the prefix assignment so it doesnt look so daft | David Heinemeier Hansson | 2012-01-27 | 1 | -2/+1 | |
| | | ||||||
* | | Revert "Fix expanding cache key for single element arrays" | David Heinemeier Hansson | 2012-01-27 | 2 | -16/+8 | |
| | | | | | | | | | | | | This reverts commit abe915f23777efe10f17d611bf5718ca855a0704. This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key. | |||||
* | | Merge check box fixes from remote-tracking branch ↵ | José Valim | 2012-01-27 | 3 | -5/+18 | |
|\ \ | |/ |/| | | | 'cantonio/checkbox-hidden-backport' into 3-2-stable | |||||
| * | don't set the hidden checkbox value if it's nil | Damien Mathieu | 2012-01-27 | 2 | -1/+9 | |
| | | ||||||
| * | check_box helper with :disabled => true generates disabled hidden field. ↵ | Tadas Tamošauskas | 2012-01-27 | 3 | -5/+8 | |
|/ | | | | fixes #1953 | |||||
* | Merge pull request #4715 from pwim/find-create-multi-args | Jon Leighton | 2012-01-27 | 2 | -1/+12 | |
| | | | | Fix regression from Rails 3.1 | |||||
* | fixes whitespace in CHANGELOG entries | Xavier Noria | 2012-01-26 | 3 | -3/+3 | |
| |