Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1542 from cmeiklejohn/dont_gsub_on_safebuffer | José Valim | 2011-06-07 | 1 | -1/+2 |
|\ | | | | | Don't operate on the safebuffer, operate on a string and convert. | ||||
| * | Don't operate on the safebuffer, operate on a string and convert. | Christopher Meiklejohn | 2011-06-07 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #1535 from smartinez87/each | José Valim | 2011-06-07 | 1 | -1/+1 |
|\ \ | | | | | | | Prefer 'each' over 'for in' syntax. | ||||
| * | | Prefer 'each' over 'for in' syntax. | Sebastian Martinez | 2011-06-07 | 1 | -1/+1 |
| |/ | |||||
* | | remove warning: assigned but unused variable | Santiago Pastorino | 2011-06-08 | 20 | -26/+16 |
| | | |||||
* | | ruby-prof doesn't work in 1.9.3 | Santiago Pastorino | 2011-06-08 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #1539 from cmeiklejohn/fix_safe_buffer_in_fragment_caching | Aaron Patterson | 2011-06-07 | 1 | -1/+3 |
|\ \ | |/ |/| | Fragment caching needs to operate on the pure output, not the safebuffer. | ||||
| * | Fragment caching needs to operate on the pure output, not the | Christopher Meiklejohn | 2011-06-07 | 1 | -1/+3 |
|/ | | | | safebuffer. | ||||
* | Ensure that the strings returned by SafeBuffer#gsub and friends aren't ↵ | Michael Koziarski | 2011-06-07 | 2 | -0/+25 |
| | | | | | | | | | | considered html_safe? Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all. Conflicts: activesupport/test/safe_buffer_test.rb | ||||
* | Allow polymorphic has_one to work when the association is set before the ↵ | Jon Leighton | 2011-06-08 | 2 | -3/+12 |
| | | | | owner has been saved. Fixes #1524. | ||||
* | When you add a record to a polymorphic has_one, you should be able to access ↵ | Jon Leighton | 2011-06-08 | 3 | -3/+6 |
| | | | | the owner from the associated record | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-08 | 3 | -64/+80 |
|\ | |||||
| * | fix spacing | Vijay Dev | 2011-06-08 | 1 | -1/+1 |
| | | |||||
| * | Add action_mailer observer and interceptors configuration options | Paco Guzman | 2011-06-07 | 2 | -5/+15 |
| | | |||||
| * | add missing generator configs | Vijay Dev | 2011-06-08 | 1 | -3/+7 |
| | | |||||
| * | proof reading and fixes in configuring guide | Vijay Dev | 2011-06-08 | 1 | -55/+57 |
| | | |||||
| * | fix indents and a code error in caching guide | Vijay Dev | 2011-06-08 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #1533 from alexandrz/master | Xavier Noria | 2011-06-07 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo | ||||
| * | | fix typo | Alexandr Zykov | 2011-06-08 | 1 | -1/+1 |
|/ / | |||||
* / | Update asset helpers to use `config.assets.prefix` | Joshua Peek | 2011-06-07 | 1 | -2/+2 |
|/ | | | Fixes #1489 | ||||
* | mention assets:clean in railties CHANGELOG | Xavier Noria | 2011-06-07 | 1 | -0/+2 |
| | |||||
* | sprockets gzips assets now | Xavier Noria | 2011-06-07 | 1 | -1/+4 |
| | |||||
* | This way asserting that updated_at was changed in touch look more obvious. | Dmitriy Kiriyenko | 2011-06-07 | 1 | -0/+1 |
| | |||||
* | Do not use default_scope in ActiveRecord::Persistence#touch. | Dmitriy Kiriyenko | 2011-06-07 | 2 | -1/+10 |
| | |||||
* | Merge pull request #1516 from guilleiguaran/rack-urlmap-fix | José Valim | 2011-06-07 | 2 | -1/+5 |
|\ | | | | | Rails::Server#app should be nice with Rack::URLMap | ||||
| * | Fixing Rails::Server#app under Rack::URLMap | Guillermo Iguaran | 2011-06-07 | 2 | -1/+5 |
|/ | |||||
* | adds missing require | Xavier Noria | 2011-06-07 | 1 | -0/+2 |
| | |||||
* | Fix a couple of helper requires that were missed. This was causing the tests ↵ | Jon Leighton | 2011-06-07 | 2 | -2/+2 |
| | | | | to fail to run on 1.8.7. | ||||
* | Merge pull request #1474 from ganeshkumar/update_column_changes | José Valim | 2011-06-07 | 1 | -0/+9 |
|\ | | | | | added tests for update_column | ||||
| * | added more tests for update_column | ganesh | 2011-06-04 | 1 | -0/+9 |
| | | |||||
* | | make sure AR isolated tests set the environment variable | Aaron Patterson | 2011-06-06 | 1 | -1/+2 |
| | | |||||
* | | Added missing assert to test checking form with namespaced isolated model ↵ | Piotr Sarnacki | 2011-06-07 | 2 | -6/+6 |
| | | | | | | | | and fixed helpers to work correctly in such case | ||||
* | | oops! add parens so the block is properly bound | Aaron Patterson | 2011-06-06 | 1 | -1/+1 |
| | | |||||
* | | set the environment variable from the rake file | Aaron Patterson | 2011-06-06 | 18 | -18/+6 |
| | | |||||
* | | more oracle fixes | Aaron Patterson | 2011-06-06 | 1 | -1/+1 |
| | | |||||
* | | do not muck with the load path, that is the test task responsibility | Aaron Patterson | 2011-06-06 | 1 | -6/+0 |
| | | |||||
* | | updating configs for oracle | Aaron Patterson | 2011-06-06 | 2 | -20/+14 |
| | | |||||
* | | add test to the include path | Aaron Patterson | 2011-06-06 | 1 | -0/+1 |
| | | |||||
* | | please use ruby -I lib:test path/to/test.rb, or export RUBY_OPT | Aaron Patterson | 2011-06-06 | 123 | -123/+125 |
| | | |||||
* | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-06 | 1 | -1/+1 |
|\ \ | |||||
| * | | add info about docrails policy on changelogs | Vijay Dev | 2011-06-07 | 1 | -1/+1 |
| | | | |||||
* | | | Don't ensure all keys in build_results are only written once, otherwise we ↵ | Jon Leighton | 2011-06-06 | 1 | -9/+8 |
| | | | | | | | | | | | | get false positive builds reported. | ||||
* | | | Make sure that the build/drop database rake tasks take account of the ↵ | Jon Leighton | 2011-06-06 | 1 | -12/+16 |
|/ / | | | | | | | test/config.yml config | ||||
* | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-06 | 61 | -681/+659 |
|\ \ | | | | | | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS | ||||
| * | | Revert "updated Changelog " | Xavier Noria | 2011-06-06 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 79990505e5080804b53d81fec059136afa2237d7. Conflicts: activerecord/CHANGELOG Reason: Sorry, CHANGELOGs can't be edited via docrails. | ||||
| * | | comment the recorder methods | Vijay Dev | 2011-06-07 | 1 | -3/+3 |
| | | | |||||
| * | | up and down are no longer class methods in a migration | Vijay Dev | 2011-06-07 | 1 | -1/+1 |
| | | | |||||
| * | | rearrange sections of the commandline guide giving more importance to rake tasks | Vijay Dev | 2011-06-07 | 1 | -63/+60 |
| | | | |||||
| * | | document assets related rake tasks | Vijay Dev | 2011-06-07 | 1 | -0/+4 |
| | | | |||||
| * | | Validations guide: order of :after_save callback was incorrect. | Mariusz Pękala | 2011-06-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | The guide was contracting itself. First it stated that 'there is a list of callbacks in order of execution', on the list 'after_save' was placed before 'after_create', and then there was a warning that 'after_save' runs after them. I am not sure about 'around_' callbacks, but let's leave that for another patch. |