Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Left off a : when specifying the :namespace option for a :controller | coreyhaines | 2012-03-09 | 1 | -1/+1 |
| | | | | path segment | ||||
* | Fix typo in isolated engine docs | Caius Durling | 2012-03-09 | 1 | -1/+1 |
| | |||||
* | Fix typo in asset pipeline guide | Matthew Conway | 2012-03-09 | 1 | -1/+1 |
| | |||||
* | Fix doc examples for has_and_belongs_to_many association | Braden Schaeffer | 2012-03-09 | 1 | -2/+2 |
| | |||||
* | Fixed a slightly misleading equivalent SQL code on the 3.2 query interface. | Swanand Pagnis | 2012-03-09 | 1 | -1/+1 |
| | |||||
* | typo | Mikhail Dieterle | 2012-03-09 | 1 | -1/+1 |
| | |||||
* | Improve docs for attr_accessible|protected related to Hash#except|slice | Carlos Antonio da Silva | 2012-03-09 | 1 | -8/+10 |
| | |||||
* | Add tests to test that through associations are not readonly, and we can ↵ | kuahyeow | 2012-03-08 | 1 | -0/+11 |
| | | | | update the records we retrive from the association | ||||
* | Merge pull request #5316 from Jacobkg/master | José Valim | 2012-03-07 | 2 | -1/+4 |
| | | | | Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings | ||||
* | Remove usage of deprecated module. | José Valim | 2012-03-07 | 1 | -1/+0 |
| | |||||
* | Add test case for #5307 | Carlos Antonio da Silva | 2012-03-07 | 1 | -2/+6 |
| | |||||
* | Set the rendered_format on respond_to. | José Valim | 2012-03-07 | 1 | -0/+1 |
| | |||||
* | Just change the formats on first render, closes #5307, closes #5308. | José Valim | 2012-03-07 | 1 | -2/+7 |
| | |||||
* | Deprecate ActionController::SessionManagement | Santiago Pastorino | 2012-03-06 | 1 | -0/+5 |
| | |||||
* | Use latest rack-cache. | José Valim | 2012-03-06 | 1 | -1/+1 |
| | |||||
* | Increasing minimum version of mail due to security vulnerability found in ↵ | Mikel Lindsaar | 2012-03-06 | 1 | -1/+1 |
| | | | | Mail 2.4.1 for sendmail or exim | ||||
* | Merge pull request #5299 from sikachu/3-2-stable-fix-responder | José Valim | 2012-03-06 | 3 | -12/+49 |
|\ | | | | | Always passing a respond block from to responder | ||||
| * | Always passing a respond block from to responder | Prem Sichanugrist | 2012-03-05 | 2 | -12/+13 |
| | | | | | | | | | | | | | | We should let the responder to decide what to do with the given overridden response block, and not short circuit it. Fixes #5280 | ||||
| * | Failing test for mime responder respond_with using a block. | Mario Visic | 2012-03-05 | 1 | -0/+36 |
|/ | |||||
* | Fix #5069 - Protect foreign key from mass assignment throught association ↵ | Jean Boussier | 2012-03-05 | 3 | -1/+40 |
| | | | | builder | ||||
* | Merge pull request #5278 from rafaelfranca/fix-build-3-2 | Michael Koziarski | 2012-03-04 | 4 | -2/+9 |
|\ | | | | | [3-2-stable] Fix build | ||||
| * | Now all the models need to explicitly declare the accessible attributes | Rafael Mendonça França | 2012-03-04 | 1 | -0/+1 |
| | | |||||
| * | Only add the whitelist_attributes option if ActiveRecord is present | Rafael Mendonça França | 2012-03-04 | 3 | -2/+8 |
|/ | | | | | | | Conflicts: railties/test/generators/app_generator_test.rb railties/test/isolation/abstract_unit.rb | ||||
* | Whitelist all attribute assignment by default. | Michael Koziarski | 2012-03-05 | 4 | -1/+20 |
| | | | | Change the default for newly generated applications to whitelist all attribute assignment. Also update the generated model classes so users are reminded of the importance of attr_accessible. | ||||
* | Only run binary type cast test with encode! on Ruby 1.9 | Carlos Antonio da Silva | 2012-03-04 | 1 | -6/+8 |
| | |||||
* | fix associations when using per class databases | Lars Kanis | 2012-03-04 | 3 | -8/+5 |
| | | | | | | would get ConnectionNotEstablished error because it always tried to use ActiveRecord::Base's connection, even though it should be using the connection of the model whose context we're operating in | ||||
* | CSS fix for guides. Closing #5028 [ci skip] | Vijay Dev | 2012-03-03 | 1 | -1/+1 |
| | | | | | | | In Ubuntu Chrome, in the last lines of code blocks, the underscore isn't visible. Increasing the line height slightly seems to fix this. This problem doesn't exist in Firefox even on Ubuntu. Too lazy to test in any other OS-browser combo :) | ||||
* | Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check ↵ | Santiago Pastorino | 2012-03-03 | 2 | -1/+4 |
| | | | | | | that info Closes #5245 | ||||
* | only log an error if there is a logger. fixes #5226 | Aaron Patterson | 2012-03-02 | 3 | -2/+11 |
| | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | ||||
* | Add CHANGELOG entry | Santiago Pastorino | 2012-03-02 | 1 | -0/+6 |
| | |||||
* | Stop SafeBuffer#clone_empty from issuing warnings | Carlos Antonio da Silva | 2012-03-02 | 1 | -3/+1 |
| | | | | | | | | | | | | Logic in clone_empty method was dealing with old @dirty variable, which has changed by @html_safe in this commit: https://github.com/rails/rails/commit/139963c99a955520db6373343662e55f4d16dcd1 This was issuing a "not initialized variable" warning - related to: https://github.com/rails/rails/pull/5237 The logic applied by this method is already handled by the [] override, so there is no need to reset the variable here. | ||||
* | Fix #5238, rendered_format is not set when template is not rendered | Piotr Sarnacki | 2012-03-02 | 2 | -2/+8 |
| | |||||
* | revert setting NOT NULL constraints in add_timestamps | Xavier Noria | 2012-03-01 | 1 | -2/+2 |
| | | | | | | | | | | | Commit 3dbedd2 added NOT NULL constraints both to table creation and modification. For creation the new default makes sense, but the generic situation for changing a table is that there exist records. Those records have no creation or modification timestamps, and in the general case you don't even know them, so when updating a table these constraints are not going to work. See a bug report for this use case in #3334. | ||||
* | Merge branch '3-2-2' into 3-2-stable | Aaron Patterson | 2012-03-01 | 14 | -39/+81 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-2: bumping to 3.2.2 Ensure [] respects the status of the buffer. Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare Merge pull request #5084 from johndouthat/patch-1 updating RAILS_VERSION delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options | ||||
| * | bumping to 3.2.2 | Aaron Patterson | 2012-03-01 | 9 | -9/+9 |
| | | |||||
| * | Merge branch '3-2-stable-security' into 3-2-2 | Aaron Patterson | 2012-03-01 | 5 | -30/+72 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-stable-security: Ensure [] respects the status of the buffer. delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options | ||||
| | * | Ensure [] respects the status of the buffer. | José Valim | 2012-02-29 | 2 | -17/+49 |
| | | | |||||
| | * | delete vulnerable AS::SafeBuffer#[] | Akira Matsuda | 2012-02-20 | 2 | -12/+0 |
| | | | |||||
| | * | 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 |
| | | | |||||
| * | | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare | Aaron Patterson | 2012-02-23 | 1 | -1/+1 |
| | | | | | | | | | | | | Fix usage of psql in db:test:prepare | ||||
| * | | Merge pull request #5084 from johndouthat/patch-1 | Aaron Patterson | 2012-02-22 | 1 | -2/+1 |
| | | | | | | | | | | | | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2... | ||||
| * | | updating RAILS_VERSION | Aaron Patterson | 2012-02-22 | 9 | -17/+17 |
| | | | |||||
* | | | Merge pull request #5206 from kennyj/fix_5173-32 | Aaron Patterson | 2012-02-29 | 3 | -12/+23 |
|\ \ \ | | | | | | | | | [3-2-stable] Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931 | ||||
| * | | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. | kennyj | 2012-02-29 | 3 | -12/+23 |
|/ / / | |||||
* | | | call binmode on the tempfile for Ruby 1.8 compatibility | Aaron Patterson | 2012-02-27 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #5190 from rafaelfranca/fix-393-3-2-stable | Aaron Patterson | 2012-02-27 | 3 | -38/+38 |
|\ \ \ | | | | | | | | | [3-2-stable] Add a new line after the textarea opening tag. | ||||
| * | | | Add a new line after the textarea opening tag. | Rafael Mendonça França | 2012-02-27 | 3 | -38/+38 |
| | | | | | | | | | | | | | | | | Closes #393 | ||||
* | | | | Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug | Aaron Patterson | 2012-02-27 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Binary mode window bug |