aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge remote branch 'jonleighton/association_fixes' into fuuuAaron Patterson2011-01-0126-255/+260
|\
| * Rename AssociationReflection#primary_key_name to foreign_key, since the optio...Jon Leighton2010-12-3116-54/+56
| * Support for :counter_cache on polymorphic belongs_toJon Leighton2010-12-313-1/+14
| * Refactor BelongsToAssociation to allow BelongsToPolymorphicAssociation to inh...Jon Leighton2010-12-316-120/+127
| * Specify the STI type condition using SQL IN rather than a whole load of ORs. ...Jon Leighton2010-12-314-6/+21
| * Verify that when has_many associated objects are destroyed via :dependent => ...Jon Leighton2010-12-312-1/+25
| * Get rid of extra_conditions param from configure_dependency_for_has_many. I c...Jon Leighton2010-12-311-9/+3
| * And owner_quoted_id can go tooJon Leighton2010-12-313-22/+0
| * Now we can drop-kick AssociationReflection#dependent_conditions into oblivion.Jon Leighton2010-12-311-11/+0
| * Refactor configure_dependency_for_has_many to use AssociationCollection#delet...Jon Leighton2010-12-312-41/+24
* | render :template is faster than render :fileSantiago Pastorino2011-01-012-5/+4
* | This is not needed anymoreSantiago Pastorino2011-01-011-3/+0
|/
* Recreate symlink in layouts for testsPiotr Sarnacki2010-12-311-0/+1
* Do not take gems' i18n locales while testing locales pathsPiotr Sarnacki2010-12-311-2/+8
* Don't be so picky on MissingTemplate error details, this fails randomly on 1....Piotr Sarnacki2010-12-311-4/+3
* added tests for the MissingTemplate exception message.Nick Sutterer2010-12-311-0/+21
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-311-1/+13
|\
| * Routing guide: clarify what the :as option does for scopesRyan Bigg2010-12-311-2/+2
| * Routing guide: move scope documentation down to where it is referenced more p...Ryan Bigg2010-12-311-10/+12
| * Routing guide: improve documentation for the scope method, demonstrating use ...Ryan Bigg2010-12-311-0/+10
* | ActionController::Base.helpers.sanitize ignores case in protocolTimothy N. Tsvetkov2010-12-303-2/+8
* | Make sure Model#touch doesn't try to update non existing columnsPratik Naik2010-12-302-2/+4
* | contrib_guide.gsub!("aptitude", "apt-get")Xavier Noria2010-12-301-4/+4
* | process_action accepts multiple args, even with Callbacks.Nick Sutterer2010-12-292-1/+22
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-2921-3460/+316
|\
| * Fix typo in ActionPack changelog.Cheah Chu Yeow2010-12-291-1/+1
| * Remove link to outdated Github tag comparison in ActionPack changelog.Cheah Chu Yeow2010-12-291-2/+0
| * Routing guide: mention that routes are matched from the top down in a note.Ryan Bigg2010-12-291-0/+3
| * fixed incorrect spacing from 98368546719cf09b3bc2Vijay Dev2010-12-291-1/+1
| * fixed examples & minor typosVijay Dev2010-12-291-7/+7
| * Added information about invoking migrations in non-default environments to NO...Karel Minarik2010-12-281-1/+1
| * Adding information and link to guide on customizing generators into "Getting ...Karel Minarik2010-12-281-1/+1
| * Fixed incorrect instructions for calling the `rails` command explicitely in t...Karel Minarik2010-12-281-1/+1
| * Added TIP box with information about the `--database` switch for the applicat...Karel Minarik2010-12-281-0/+2
| * Fixed incorrect command for displaying options for new application Generator ...Karel Minarik2010-12-281-1/+1
| * There's a couple -> There are a coupleRyan Bigg2010-12-281-1/+1
| * Init guide: begin down the rabbit warren that is active_record/railtieRyan Bigg2010-12-281-0/+77
| * Init: finish coverage of railties/lib/rails.rbRyan Bigg2010-12-281-0/+7
| * init guide: Cover the action_dispatch/railtie require from rails.rbRyan Bigg2010-12-281-0/+112
| * Remove old initialization guide text. Too much has changed for all of this to...Ryan Bigg2010-12-281-3549/+0
| * init guide: cover active_support/railtie.rbRyan Bigg2010-12-281-0/+12
| * Init guide: Segue between rails/version and active_support/railtie requiresRyan Bigg2010-12-281-0/+2
| * Cover the inherited method from Rails::Railtie being used when I18n::Railtie ...Ryan Bigg2010-12-281-1/+33
| * Init guide: finish covering the process of the i18n_railtie.rb file.Ryan Bigg2010-12-281-0/+20
| * init guide: active_support/railtie does not require itself, actually requires...Ryan Bigg2010-12-281-1/+1
| * Init guide: finish covering initializers for i18n_railtie, moving on to cover...Ryan Bigg2010-12-281-0/+41
| * init guide: active_support/inflector/methods is loaded by active_support/auto...Ryan Bigg2010-12-281-5/+13
| * Init guide: cover Railtie::Configuration and begin to cover the Initializer c...Ryan Bigg2010-12-271-4/+73
| * Init guide: Cover the config variable set up which is referenced in i18n_railtieRyan Bigg2010-12-271-0/+14
| * fix spacingVijay Dev2010-12-261-1/+1