aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix output safety issue with select optionsSergey Nartimov2012-02-202-4/+11
|
* Fix a failing testSantiago Pastorino2012-02-201-0/+2
|
* Use the right format when a partial is missing.Santiago Pastorino2012-02-203-0/+9
| | | | Closes #5025
* Merge pull request #5101 from ckdake/ckdake_actionview_handler_resetJosé Valim2012-02-202-0/+7
|\ | | | | Reset memoized hash keys when new ActionView::Template handler is registered
| * Reset memoized hash keys when new entry addedChris Kelly2012-02-202-0/+7
|/
* search private / protected methods in trunk rubyAaron Patterson2012-02-201-1/+1
|
* sync __run_callbacks with ruby-trunkSokolov Yura2012-02-201-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 filenamesAndrew White2012-02-2013-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 Dev2012-02-181-1/+1
|
* Documenting the :inverse_of option for associationsMike Gunderloy2012-02-181-0/+99
|
* fix spacer template exampleSergey Nartimov2012-02-181-1/+1
|
* Update Time#change docs to reflect the options it usesEric Oestrich2012-02-181-1/+1
| | | | [ci skip]
* Fix actionpack readme weblog exampleAlexey Vakhov2012-02-181-1/+1
|
* Merge pull request #5081 from arunagw/fix_ar_testXavier Noria2012-02-181-1/+5
|\ | | | | Fix ar test
| * fix test with ruby 187-p358Arun Agrawal2012-02-181-1/+5
|/
* Simplify regexpAndrew White2012-02-171-1/+1
|
* Fix ActionDispatch::Static to serve files with unencoded PCHARAndrew White2012-02-1714-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_p358Santiago Pastorino2012-02-171-2/+2
|\ | | | | Fix failing test ruby187 p358
| * Fixes failing test with ruby 1.8.7-p358Arun Agrawal2012-02-171-2/+2
| | | | | | Same as 91a9b2441783de118a2f9ec11b0aa3ae80133d91
* | Merge pull request #5073 from asanghi/4918_backportJosé Valim2012-02-172-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 Sanghi2012-02-172-1/+15
|/ | | | by googlebot
* Merge pull request #5049 from fabioyamate/masterJosé Valim2012-02-152-3/+10
| | | | Fix sanitize_for_mass_assigment when role is nil
* adding tests to document behavior for #4817Aaron Patterson2012-02-141-0/+26
|
* Rack body respond to each and not to joinSantiago Pastorino2012-02-142-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-redoJosé Valim2012-02-141-1/+4
| | | | Always reenable _dump task in AR databases rake. Closes #5030
* Fix deprecation warning in AS::Concern.José Valim2012-02-131-1/+1
|
* Fix that failed tests should exit with a nonzero error code.Jeremy Kemper2012-02-102-31/+17
| | | | | | Partially reverts 14c89e7285d4e7cd40a542fbc31d9345f60c3aa4. Hat tip to @tenderlove for paring down the TestTask!
* Merge pull request #4988 from kennyj/fix_4720-3Aaron Patterson2012-02-102-0/+31
| | | | Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
* Merge pull request #4941 from rafaelfranca/fix-buildJosé Valim2012-02-081-3/+3
|\ | | | | Use real table and columns for index test
| * Use real table and columns for index testRafael Mendonça França2012-02-081-3/+3
|/
* 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
| | | | | | | | | | | | | | | | | | | | | | | 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 Leighton2012-02-073-0/+25
| | | | | | Conflicts: activerecord/lib/active_record/core.rb
* 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
|\ | | | | Fixed force_ssl redirects to include original query params
| * Added unit test to cover changes to RouteSet.url_forRyan McGeary2012-02-071-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 paramsRyan McGeary2012-02-063-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 Fenske2012-02-071-1/+2
| |
* | Merge pull request #4920 from guilleiguaran/revert-gemfile-edgeJosé Valim2012-02-073-4/+4
|\ \ | | | | | | In Rails 3.2.x --edge generate apps with rails 3-2-stable
| * | --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 --edge (3-2-stable)
| * Add branch to sass-rails and coffee-rails for apps generated with --dev or ↵Guillermo Iguaran2012-02-061-2/+2
|/ | | | --edge options (3.2.x)
* Merge pull request #4908 from kennyj/fix_3864José Valim2012-02-062-1/+34
| | | | Fix url_for method's behavior. GH #3684.
* Merge pull request #4890 from kennyj/improvement_4883Santiago Pastorino2012-02-052-3/+4
|\ | | | | GH #4883. Optional start_day argument for Time#all_week
| * 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_with
| * Fix override API response bug in respond_withPrem Sichanugrist2012-02-034-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