Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use AS::SafeBuffer#clone_empty for flushing the output_buffer | Akira Matsuda | 2012-02-20 | 1 | -1/+1 |
| | |||||
* | add AS::SafeBuffer#clone_empty | Akira Matsuda | 2012-02-20 | 2 | -0/+15 |
| | |||||
* | fix output safety issue with select options | Sergey Nartimov | 2012-02-20 | 2 | -4/+11 |
| | |||||
* | Fix a failing test | Santiago Pastorino | 2012-02-20 | 1 | -0/+2 |
| | |||||
* | Use the right format when a partial is missing. | Santiago Pastorino | 2012-02-20 | 3 | -0/+9 |
| | | | | Closes #5025 | ||||
* | Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset | José Valim | 2012-02-20 | 2 | -0/+7 |
|\ | | | | | Reset memoized hash keys when new ActionView::Template handler is registered | ||||
| * | Reset memoized hash keys when new entry added | Chris Kelly | 2012-02-20 | 2 | -0/+7 |
|/ | |||||
* | search private / protected methods in trunk ruby | Aaron Patterson | 2012-02-20 | 1 | -1/+1 |
| | |||||
* | sync __run_callbacks with ruby-trunk | Sokolov Yura | 2012-02-20 | 1 | -1/+1 |
| | | | | | | https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580 In this revision behavior of respond_to? had changed: now to ask about protected method one should pass second argument `true` | ||||
* | Remove fixture files with Windows incompatible filenames | Andrew White | 2012-02-20 | 13 | -39/+88 |
| | | | | | | Windows doesn't allow `\ / : * ? " < > |` in filenames so create the fixture files at runtime and ignore the incompatible ones when running on Windows. | ||||
* | fix a typo [ci skip] | Vijay Dev | 2012-02-18 | 1 | -1/+1 |
| | |||||
* | Documenting the :inverse_of option for associations | Mike Gunderloy | 2012-02-18 | 1 | -0/+99 |
| | |||||
* | fix spacer template example | Sergey Nartimov | 2012-02-18 | 1 | -1/+1 |
| | |||||
* | Update Time#change docs to reflect the options it uses | Eric Oestrich | 2012-02-18 | 1 | -1/+1 |
| | | | | [ci skip] | ||||
* | Fix actionpack readme weblog example | Alexey Vakhov | 2012-02-18 | 1 | -1/+1 |
| | |||||
* | Merge pull request #5081 from arunagw/fix_ar_test | Xavier Noria | 2012-02-18 | 1 | -1/+5 |
|\ | | | | | Fix ar test | ||||
| * | fix test with ruby 187-p358 | Arun Agrawal | 2012-02-18 | 1 | -1/+5 |
|/ | |||||
* | Simplify regexp | Andrew White | 2012-02-17 | 1 | -1/+1 |
| | |||||
* | 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 |
| |