Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix ActionDispatch::Static to serve files with unencoded PCHAR | Andrew White | 2012-02-17 | 14 | -2/+50 |
| | | | | | | | | | | | RFC 3986[1] allows sub-delim characters in path segments unencoded, however Rack::File requires them to be encoded so we use URI's unescape method to leave them alone and then escape them again. Also since the path gets passed to Dir[] we need to escape any glob characters in the path. [1]: http://www.ietf.org/rfc/rfc3986.txt | ||||
* | Merge pull request #5071 from arunagw/fix_failing_test_ruby187_p358 | Santiago Pastorino | 2012-02-17 | 1 | -2/+2 |
|\ | | | | | Fix failing test ruby187 p358 | ||||
| * | Fixes failing test with ruby 1.8.7-p358 | Arun Agrawal | 2012-02-17 | 1 | -2/+2 |
| | | | | | | Same as 91a9b2441783de118a2f9ec11b0aa3ae80133d91 | ||||
* | | Merge pull request #5073 from asanghi/4918_backport | José Valim | 2012-02-17 | 2 | -1/+15 |
|\ \ | |/ |/| | Backporting #4918 with one added test for googlebot accept header as I saw it | ||||
| * | backporting #4918 to 3.2 stable; adding extra test for accept header given ↵ | Aditya Sanghi | 2012-02-17 | 2 | -1/+15 |
|/ | | | | by googlebot | ||||
* | Merge pull request #5049 from fabioyamate/master | José Valim | 2012-02-15 | 2 | -3/+10 |
| | | | | Fix sanitize_for_mass_assigment when role is nil | ||||
* | 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 |
| | | | | | | | This fixes undef `to_str' for Rack::Chunked::Body when using caches_action + streaming on an action Closes #5027 | ||||
* | Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo | José Valim | 2012-02-14 | 1 | -1/+4 |
| | | | | Always reenable _dump task in AR databases rake. Closes #5030 | ||||
* | 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 |
| | | | | | | Partially reverts 14c89e7285d4e7cd40a542fbc31d9345f60c3aa4. Hat tip to @tenderlove for paring down the TestTask! | ||||
* | Merge pull request #4988 from kennyj/fix_4720-3 | Aaron Patterson | 2012-02-10 | 2 | -0/+31 |
| | | | | Fix GH #4720. Routing problem with nested namespace and already camelized controller option. | ||||
* | Merge pull request #4941 from rafaelfranca/fix-build | José Valim | 2012-02-08 | 1 | -3/+3 |
|\ | | | | | Use real table and columns for index test | ||||
| * | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | Our schema.rb is being generated with an `add_index` line similar to this: add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil} This is the same as it was on Rails 3.1.3, however, now when that schema.rb is evaluated, its generating bad SQL in MySQL: Mysql::Error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '))' at line 1: CREATE UNIQUE INDEX `xxx` ON `foo` (`foo`(8), `bar`()) This commit adds a check for nil on the length attribute to prevent the empty parens from being output. Conflicts: activerecord/test/cases/migration/index_test.rb Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fix attribute_before_type_cast for serialized attributes. Fixes #4837. | Jon Leighton | 2012-02-07 | 3 | -0/+25 |
| | | | | | | Conflicts: activerecord/lib/active_record/core.rb | ||||
* | 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 |
|\ | | | | | Fixed force_ssl redirects to include original query params | ||||
| * | Added unit test to cover changes to RouteSet.url_for | Ryan McGeary | 2012-02-07 | 1 | -0/+16 |
| | | | | | | | | | | ActionDispatch::Routing::RouteSet.url_for now handles passing params through to ActionDispatch::Http::Url.url_for | ||||
| * | Fixed force_ssl redirects to include original query params | Ryan McGeary | 2012-02-06 | 3 | -0/+8 |
| | | | | | | | | | | | | `ActionController.force_ssl` redirects http URLs to their https equivalent; however, when a URL contains a query string, the resulting redirect lacked the original query string. | ||||
* | | 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 |
|\ \ | | | | | | | 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) |