| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | * | | | Fixing Windows asset tag helper test failure | Ralph Shnelvar | 2012-02-25 | 1 | -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ça | 2012-02-26 | 1 | -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 parameters | Andrew White | 2012-02-26 | 1 | -2/+27 |
| |/ / / | |||||
| * | | | Fix typo in match :to docs | Justin Woodbridge | 2012-02-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed typo in composed_of example with Money#<=>, was comparing amount ↵ | Noah Hendrix | 2012-02-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | itself instead of other_money.amount | ||||
| * | | | Merge pull request #5170 from arunagw/3-2-stable | Santiago Pastorino | 2012-02-25 | 1 | -3/+3 |
| |\ \ \ | | | | | | | | | assert => assert_equal | ||||
| | * | | | assert => assert_equal | Arun Agrawal | 2012-02-25 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Merge pull request #5166 from arunagw/3-2-stable | Xavier Noria | 2012-02-25 | 1 | -4/+3 |
| |\| | | | | | | | | | | | 3 2 stable | ||||
| | * | | | Checking headers in a better way. as doing here | Arun Agrawal | 2012-02-25 | 1 | -4/+3 |
| |/ / / | | | | | | | | | | 406ece4729e8fd81f156bcb3fce16e938522466e | ||||
| * | | | Merge pull request #5164 from arunagw/build_fix_ruby187-p358 | Xavier Noria | 2012-02-25 | 1 | -2/+7 |
| |\ \ \ | | | | | | | | | Build fix ruby187 p358 | ||||
| | * | | | Build fix for ruby187-p358 | Arun Agrawal | 2012-02-25 | 1 | -2/+7 |
| |/ / / | |||||
| * | | | 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 | ||||
| * | | | Avoid inspecting the whole route set, closes #1525 | José Valim | 2012-02-23 | 1 | -0/+6 |
| | | | | |||||
| * | | | Merge pull request #5087 from pwnall/no_view_logger | Aaron Patterson | 2012-02-22 | 1 | -3/+1 |
| |\ \ \ | | | | | | | | | Remove reference to config.action_view.logger from Rails configuration guide | ||||
| | * | | | Removed (outdated?) config.action_view.logger from configuration guide. | Victor Costan | 2012-02-19 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | 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... | ||||
| * | | | Fix CHANGELOG | Santiago Pastorino | 2012-02-22 | 1 | -2/+2 |
| | | | | |||||
| * | | | Add CHANGELOG entry | Santiago Pastorino | 2012-02-22 | 1 | -0/+2 |
| | | | | |||||
| * | | | format lookup for partials is derived from the format in which the template ↵ | Santiago Pastorino | 2012-02-22 | 11 | -36/+25 |
| | | | | | | | | | | | | | | | | | | | is being rendered Closes #5025 part 2 | ||||
| * | | | bumping up arel | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | prepared statements can be disabled | Aaron Patterson | 2012-02-21 | 8 | -30/+56 |
| | | | | |||||
| * | | | tag bind params with a bind param object | Aaron Patterson | 2012-02-21 | 3 | -3/+3 |
| | | | | |||||
| * | | | more ruby 2.0 respond_to? changes | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | ruby 2.0 makes protected methods return false for respond_to, so pass true ↵ | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | as the second param | ||||
| * | | | fix bad docs from f373f296 [ci skip] | Vijay Dev | 2012-02-21 | 1 | -3/+3 |
| | | | | |||||
| * | | | Don't wrap the raise with ensure | Santiago Pastorino | 2012-02-21 | 2 | -10/+12 |
| | | | | |||||
| * | | | Merge pull request #5096 from lawso017/master | Aaron Patterson | 2012-02-21 | 2 | -19/+43 |
| | | | | | | | | | | | | | Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys | ||||
| * | | | Restore lookup formats to the previous value after searching for the failing ↵ | Santiago Pastorino | 2012-02-21 | 2 | -2/+5 |
| | | | | | | | | | | | | | view | ||||
| * | | | Add CHANGELOG entry | Santiago Pastorino | 2012-02-21 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge pull request #5106 from kennyj/fix_warnings_20120210 | Santiago Pastorino | 2012-02-21 | 6 | -27/+29 |
| |\ \ \ | |_|/ |/| | | [3-2-stable] Fix some warnings | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |