aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove warning: assigned but unused variableSantiago Pastorino2011-06-0820-26/+16
* ruby-prof doesn't work in 1.9.3Santiago Pastorino2011-06-081-1/+2
* Merge pull request #1539 from cmeiklejohn/fix_safe_buffer_in_fragment_cachingAaron Patterson2011-06-071-1/+3
|\
| * Fragment caching needs to operate on the pure output, not theChristopher Meiklejohn2011-06-071-1/+3
|/
* Ensure that the strings returned by SafeBuffer#gsub and friends aren't consid...Michael Koziarski2011-06-072-0/+25
* Allow polymorphic has_one to work when the association is set before the owne...Jon Leighton2011-06-082-3/+12
* When you add a record to a polymorphic has_one, you should be able to access ...Jon Leighton2011-06-083-3/+6
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-083-64/+80
|\
| * fix spacingVijay Dev2011-06-081-1/+1
| * Add action_mailer observer and interceptors configuration optionsPaco Guzman2011-06-072-5/+15
| * add missing generator configsVijay Dev2011-06-081-3/+7
| * proof reading and fixes in configuring guideVijay Dev2011-06-081-55/+57
| * fix indents and a code error in caching guideVijay Dev2011-06-081-4/+4
* | Merge pull request #1533 from alexandrz/masterXavier Noria2011-06-071-1/+1
|\ \
| * | fix typoAlexandr Zykov2011-06-081-1/+1
|/ /
* / Update asset helpers to use `config.assets.prefix` Joshua Peek2011-06-071-2/+2
|/
* mention assets:clean in railties CHANGELOGXavier Noria2011-06-071-0/+2
* sprockets gzips assets nowXavier Noria2011-06-071-1/+4
* This way asserting that updated_at was changed in touch look more obvious.Dmitriy Kiriyenko2011-06-071-0/+1
* Do not use default_scope in ActiveRecord::Persistence#touch.Dmitriy Kiriyenko2011-06-072-1/+10
* Merge pull request #1516 from guilleiguaran/rack-urlmap-fixJosé Valim2011-06-072-1/+5
|\
| * Fixing Rails::Server#app under Rack::URLMapGuillermo Iguaran2011-06-072-1/+5
|/
* adds missing requireXavier Noria2011-06-071-0/+2
* Fix a couple of helper requires that were missed. This was causing the tests ...Jon Leighton2011-06-072-2/+2
* Merge pull request #1474 from ganeshkumar/update_column_changesJosé Valim2011-06-071-0/+9
|\
| * added more tests for update_columnganesh2011-06-041-0/+9
* | make sure AR isolated tests set the environment variableAaron Patterson2011-06-061-1/+2
* | Added missing assert to test checking form with namespaced isolated model and...Piotr Sarnacki2011-06-072-6/+6
* | oops! add parens so the block is properly boundAaron Patterson2011-06-061-1/+1
* | set the environment variable from the rake fileAaron Patterson2011-06-0618-18/+6
* | more oracle fixesAaron Patterson2011-06-061-1/+1
* | do not muck with the load path, that is the test task responsibilityAaron Patterson2011-06-061-6/+0
* | updating configs for oracleAaron Patterson2011-06-062-20/+14
* | add test to the include pathAaron Patterson2011-06-061-0/+1
* | please use ruby -I lib:test path/to/test.rb, or export RUBY_OPTAaron Patterson2011-06-06123-123/+125
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-061-1/+1
|\ \
| * | add info about docrails policy on changelogsVijay Dev2011-06-071-1/+1
* | | Don't ensure all keys in build_results are only written once, otherwise we ge...Jon Leighton2011-06-061-9/+8
* | | Make sure that the build/drop database rake tasks take account of the test/co...Jon Leighton2011-06-061-12/+16
|/ /
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-0661-681/+659
|\ \
| * | Revert "updated Changelog "Xavier Noria2011-06-061-1/+6
| * | comment the recorder methodsVijay Dev2011-06-071-3/+3
| * | up and down are no longer class methods in a migrationVijay Dev2011-06-071-1/+1
| * | rearrange sections of the commandline guide giving more importance to rake tasksVijay Dev2011-06-071-63/+60
| * | document assets related rake tasksVijay Dev2011-06-071-0/+4
| * | Validations guide: order of :after_save callback was incorrect.Mariusz Pękala2011-06-061-2/+2
| * | Change http://api.rubyonrails.com to http://api.rubyonrails.orgGuillermo Iguaran2011-06-051-2/+2
| * | Edited railties/guides/source/asset_pipeline.textile via GitHubMohammad Typaldos2011-06-051-3/+15
| * | minor edits in migrations guideVijay Dev2011-06-061-4/+4
| * | annotate class_eval method for active resource schema attributesVijay Dev2011-06-051-2/+8