aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Always passing a respond block from to responderPrem Sichanugrist2012-03-052-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 Visic2012-03-051-0/+36
|
* Fix #5069 - Protect foreign key from mass assignment throught association ↵Jean Boussier2012-03-053-1/+40
| | | | builder
* Merge pull request #5278 from rafaelfranca/fix-build-3-2Michael Koziarski2012-03-044-2/+9
|\ | | | | [3-2-stable] Fix build
| * Now all the models need to explicitly declare the accessible attributesRafael Mendonça França2012-03-041-0/+1
| |
| * Only add the whitelist_attributes option if ActiveRecord is presentRafael Mendonça França2012-03-043-2/+8
|/ | | | | | | Conflicts: railties/test/generators/app_generator_test.rb railties/test/isolation/abstract_unit.rb
* Whitelist all attribute assignment by default.Michael Koziarski2012-03-054-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.9Carlos Antonio da Silva2012-03-041-6/+8
|
* fix associations when using per class databasesLars Kanis2012-03-043-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 Dev2012-03-031-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 Pastorino2012-03-032-1/+4
| | | | | | that info Closes #5245
* only log an error if there is a logger. fixes #5226Aaron Patterson2012-03-023-2/+11
| | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
* Add CHANGELOG entrySantiago Pastorino2012-03-021-0/+6
|
* Stop SafeBuffer#clone_empty from issuing warningsCarlos Antonio da Silva2012-03-021-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 renderedPiotr Sarnacki2012-03-022-2/+8
|
* revert setting NOT NULL constraints in add_timestampsXavier Noria2012-03-011-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-stableAaron Patterson2012-03-0114-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.2Aaron Patterson2012-03-019-9/+9
| |
| * Merge branch '3-2-stable-security' into 3-2-2Aaron Patterson2012-03-015-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é Valim2012-02-292-17/+49
| | |
| | * delete vulnerable AS::SafeBuffer#[]Akira Matsuda2012-02-202-12/+0
| | |
| | * use AS::SafeBuffer#clone_empty for flushing the output_bufferAkira Matsuda2012-02-201-1/+1
| | |
| | * add AS::SafeBuffer#clone_emptyAkira Matsuda2012-02-202-0/+15
| | |
| | * fix output safety issue with select optionsSergey Nartimov2012-02-202-4/+11
| | |
| * | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepareAaron Patterson2012-02-231-1/+1
| | | | | | | | | | | | Fix usage of psql in db:test:prepare
| * | Merge pull request #5084 from johndouthat/patch-1Aaron Patterson2012-02-221-2/+1
| | | | | | | | | | | | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
| * | updating RAILS_VERSIONAaron Patterson2012-02-229-17/+17
| | |
* | | Merge pull request #5206 from kennyj/fix_5173-32Aaron Patterson2012-02-293-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.kennyj2012-02-293-12/+23
|/ / /
* | | call binmode on the tempfile for Ruby 1.8 compatibilityAaron Patterson2012-02-271-1/+2
| | |
* | | Merge pull request #5190 from rafaelfranca/fix-393-3-2-stableAaron Patterson2012-02-273-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ça2012-02-273-38/+38
| | | | | | | | | | | | | | | | Closes #393
* | | | Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bugAaron Patterson2012-02-271-1/+1
|\ \ \ \ | |/ / / |/| | | Binary mode window bug
| * | | Fixing Windows asset tag helper test failureRalph Shnelvar2012-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In asset_tag_helper_test.rb there is an assert on the number of bytes in a concatenated file. This test failed because Windows converts \n to \r\n as the default for "w". This is different than in *nix systems where there is no conversion done. THe test that failed was test_caching_stylesheet_link_tag_when_caching_on Using bin mode fixes this behavior on windows and makes no change on the *nix systems.
* | | | Revert "No need to pass options which is never used"Rafael Mendonça França2012-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Options is needed for some Rails extensions to determine when referential integrity should be disabled This reverts commit bcb466c543451dce69403aaae047295758589d8e. Fixes #5052
* | | | Adding tests for non-optional glob parametersAndrew White2012-02-261-2/+27
|/ / /
* | | Fix typo in match :to docsJustin Woodbridge2012-02-251-1/+1
| | |
* | | Fixed typo in composed_of example with Money#<=>, was comparing amount ↵Noah Hendrix2012-02-251-1/+1
| | | | | | | | | | | | itself instead of other_money.amount
* | | Merge pull request #5170 from arunagw/3-2-stableSantiago Pastorino2012-02-251-3/+3
|\ \ \ | | | | | | | | assert => assert_equal
| * | | assert => assert_equalArun Agrawal2012-02-251-3/+3
| | | |
* | | | Merge pull request #5166 from arunagw/3-2-stableXavier Noria2012-02-251-4/+3
|\| | | | | | | | | | | 3 2 stable
| * | | Checking headers in a better way. as doing hereArun Agrawal2012-02-251-4/+3
|/ / / | | | | | | | | | 406ece4729e8fd81f156bcb3fce16e938522466e
* | | Merge pull request #5164 from arunagw/build_fix_ruby187-p358Xavier Noria2012-02-251-2/+7
|\ \ \ | | | | | | | | Build fix ruby187 p358
| * | | Build fix for ruby187-p358Arun Agrawal2012-02-251-2/+7
|/ / /
* | | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepareAaron Patterson2012-02-231-1/+1
| | | | | | | | | | | | Fix usage of psql in db:test:prepare
* | | Avoid inspecting the whole route set, closes #1525José Valim2012-02-231-0/+6
| | |
* | | Merge pull request #5087 from pwnall/no_view_loggerAaron Patterson2012-02-221-3/+1
|\ \ \ | | | | | | | | Remove reference to config.action_view.logger from Rails configuration guide
| * | | Removed (outdated?) config.action_view.logger from configuration guide.Victor Costan2012-02-191-3/+1
| | | |
* | | | Merge pull request #5084 from johndouthat/patch-1Aaron Patterson2012-02-221-2/+1
| |/ / |/| | | | | | | | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
* | | Fix CHANGELOGSantiago Pastorino2012-02-221-2/+2
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 09:46:56 +0000