aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-03-1553-288/+339
|\
| * with_output_buffer cannot assume there's an output_bufferXavier Noria2010-03-152-1/+7
| * to_str works hereJeremy Kemper2010-03-152-6/+2
| * CI: sudo rm to sledgehammer bad permsJeremy Kemper2010-03-151-1/+1
| * Hack to keep column metadata queries out of test query countsJeremy Kemper2010-03-151-3/+7
| * cleaning up many more warnings in activerecord [#4180 state:resolved]Aaron Patterson2010-03-154-3/+17
| * Don't force singularization of singleton resource names, e.g. /preferences [#...Andrew White2010-03-152-8/+15
| * read_ and write_fragment cache preserve html safety yet cache strings onlyJeremy Kemper2010-03-142-6/+19
| * speeding up clone_attributes, changing readonly to be initialized in def init...Aaron Patterson2010-03-141-8/+9
| * cleaning up some test warningsAaron Patterson2010-03-144-5/+16
| * There's a Ruby issue with File.basename different versions returns different ...Santiago Pastorino2010-03-141-1/+0
| * Making escaped things more readableSantiago Pastorino2010-03-143-3/+3
| * Optimize DetailsKey generation.José Valim2010-03-141-4/+5
| * restricts a test to < 1.9, and rewrites it using a proper expectationXavier Noria2010-03-132-11/+6
| * Ensure controller filters are executed before stuff starts to happen.José Valim2010-03-133-3/+21
| * Remove formats setters from render template, speeding up partial and collecti...José Valim2010-03-131-2/+1
| * adds coverage for the issue addressed in fe43bbdXavier Noria2010-03-121-0/+14
| * In app_generator, fix hardcoded `bundle` call to derive the bundle executable...Caio Chassot2010-03-122-3/+5
| * Add a check to ensure that the application name does not already exist, i.e. ...Kieran Pilkington2010-03-122-0/+9
| * Made asset_tag_helper use config.perform_caching instead of ActionController:...Denis Odorcic2010-03-122-32/+32
| * Prettify generators description whenever using the default stack [#4143 statu...José Valim2010-03-122-2/+20
| * keep AssociationProxy#to_a to avoid warning in Array(post.author), and delega...Xavier Noria2010-03-122-1/+2
| * Load the environment before executing rails console. [#3905 status:resolved]José Valim2010-03-121-1/+1
| * Revert "Always load the environment before executing any command. [#3905 stat...José Valim2010-03-122-6/+11
| * Finish cleaning up rendering stack from views and move assigns evaluation to ...José Valim2010-03-1215-75/+68
| * Allow anything that responds to render to be given as :template and use find_...José Valim2010-03-129-120/+65
* | AS guide: documents a use case for :instance_writer, based on a remark of JeremyXavier Noria2010-03-151-0/+2
* | refactors some bits of the guides generator, ONLY selection accepts prefixes,...Xavier Noria2010-03-151-39/+51
* | Update of block helpers examples in form_helper.rbJeroen van Dijk2010-03-131-32/+32
* | Updated documentation for block helpers in render/layouts.rbJeroen van Dijk2010-03-121-2/+2
* | Merge remote branch 'mainstream/master'Pratik Naik2010-03-12361-4154/+5293
|\|
| * Always load the environment before executing any command. [#3905 status:resol...José Valim2010-03-122-11/+6
| * %= works for content_tag and does not require parenthesis on method callJosé Valim2010-03-122-49/+8
| * Make all AP tests pass for Ruby 1.9.1.José Valim2010-03-124-17/+19
| * Be sure to pass through args to to_yamlJeremy Kemper2010-03-112-3/+3
| * Fix testJeremy Kemper2010-03-111-1/+1
| * Write strings to fragment cache, not outputbuffersJeremy Kemper2010-03-112-2/+8
| * OutputBuffer#to_yaml should return string yaml, not some custom class dumpJeremy Kemper2010-03-112-0/+8
| * Delegate #encoding to SafeBuffer tooJeremy Kemper2010-03-111-0/+4
| * simplify alt tag generation for imagesEaden McKee2010-03-112-3/+6
| * Revert "Rake task for generating Rails documentation updated to support Bundl...Jeremy Kemper2010-03-111-33/+41
| * ActionController::Base.request_forgery_protection_token should actually be th...Carl Lerche2010-03-111-1/+1
| * Rake task for generating Rails documentation updated to support Bundler.Rizwan Reza2010-03-111-41/+33
| * Add tests for lookup context.José Valim2010-03-114-34/+203
| * Float arel on latest rails/arelJeremy Kemper2010-03-101-1/+1
| * Update scaffold to use <%= form_forJeremy Kemper2010-03-101-1/+1
| * Use arel 0.3.1, for srsJeremy Kemper2010-03-101-1/+1
| * For rails tests, use latest from rails/arel.gitJeremy Kemper2010-03-101-0/+1
| * Bump arel dep to 0.3.0+Jeremy Kemper2010-03-101-1/+1
| * Arel now fallback to using Arel::Attribute if the table/column doesn't exists.Emilio Tagua2010-03-101-3/+1