aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'rails/master' into identity_mapEmilio Tagua2010-12-2063-962/+2183
|\
| * Small changes on AD::Reloader.José Valim2010-12-202-4/+5
| * Use AD::Reloader.to_cleanup for reloading [#2873 state:resolved]John Firebaugh2010-12-201-5/+3
| * Replace AD::Callbacks.to_prepare with AD::Reloader.to_prepareJohn Firebaugh2010-12-204-9/+12
| * Introduce ActionDispatch::ReloaderJohn Firebaugh2010-12-202-0/+8
| * More love for engines testsPiotr Sarnacki2010-12-191-73/+61
| * Use assert_bodyJohn Firebaugh2010-12-191-22/+14
| * Remove require AS::Concern from places where is already inSantiago Pastorino2010-12-191-2/+0
| * Temporary fix for railties test for newest rack changesPiotr Sarnacki2010-12-191-0/+8
| * Fix indentationSantiago Pastorino2010-12-191-3/+3
| * Use Concern in Rails::Railtie::ConfigurableSantiago Pastorino2010-12-191-3/+3
| * Refactoring of application's task in engine.rakePiotr Sarnacki2010-12-191-20/+23
| * Do not load all application's task in generated enginePiotr Sarnacki2010-12-192-6/+69
| * Fix tests in railtiesPiotr Sarnacki2010-12-182-13/+13
| * Use require 'bundler/setup' instead of directly calling Bundler.setup in conf...Piotr Sarnacki2010-12-171-10/+3
| * Allow to use BUNDLE_GEMFILE env variable in boot.rb [#6184 state:resolved]Piotr Sarnacki2010-12-171-1/+1
| * Generate add_index by default when giving type belongs_to or referencesSantiago Pastorino2010-12-162-3/+8
| * Changelog and guide entries for config.action_view.cache_template_loadingPiotr Sarnacki2010-12-161-0/+2
| * Bring back config.action_view.cache_template_loading [#5847 state:resolved]Piotr Sarnacki2010-12-161-0/+38
| * dragdrop was tested twice and effects.js was missing, added checks for contro...Santiago Pastorino2010-12-161-1/+4
| * removed info about deprecated rake tasks, documented the sandbox option for t...Vijay Dev2010-12-161-24/+18
| * AppGenerator: use options instead of @optionsPiotr Sarnacki2010-12-161-3/+3
| * Kill whitespace!Piotr Sarnacki2010-12-161-3/+3
| * Generate default layout in engine with --mountable optionPiotr Sarnacki2010-12-164-2/+8
| * Fix generation of prototype files, it should work with --javascript prototype...Piotr Sarnacki2010-12-163-2/+5
| * Generate javascripts in engine with --mountable optionPiotr Sarnacki2010-12-164-5/+70
| * Set proper engine's asset directories when assets are served from engine.Piotr Sarnacki2010-12-161-0/+64
| * Should be isolated engine instead of namespaced enginePiotr Sarnacki2010-12-161-1/+1
| * Fix indentation and newlines in generated enginePiotr Sarnacki2010-12-162-2/+2
| * Skip creating migration if --skip option is passed to model generator [#6144 ...Piotr Sarnacki2010-12-162-4/+16
| * Allow to generate namespaced generators [#6140 state:resolved]Piotr Sarnacki2010-12-162-2/+41
| * Tables style unificationSantiago Pastorino2010-12-161-63/+63
| * Add named helper to photo controller exampleSantiago Pastorino2010-12-161-8/+8
| * Add underline to headerSantiago Pastorino2010-12-161-1/+1
| * Add named helper output to translated paths exampleSantiago Pastorino2010-12-161-8/+8
| * fixed typosVijay Dev2010-12-161-6/+6
| * minor formatting fixesVijay Dev2010-12-161-19/+19
| * fixed link to ruby-profVijay Dev2010-12-161-1/+1
| * fixed fontVijay Dev2010-12-151-1/+1
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2010-12-154-123/+438
| |\
| | * Active Support coreext guide: Logger core extension documentationRyan Bigg2010-12-151-0/+43
| | * WIP: Reviewing the initialization guide for Rails 3.1Ryan Bigg2010-12-151-121/+393
| | * It should be ActiveModel::Validator, not ActiveRecord::Validator.Elben Shira2010-12-141-1/+1
| | * for the root route to work, we need to delete the public/index.html.erbUmar Sheikh2010-12-131-1/+1
| * | filter_parameter_logging is deprecated in Rails 3. Changed it to config.filte...Vijay Dev2010-12-151-2/+2
| |/
| * fixed typos in mailerVijay Dev2010-12-121-8/+6
| * fixed typos and rephrased a few sentences; also removed reference to status c...vijay2010-12-111-14/+10
| * Updated generator guide for rails commit 7891de893951c780a1732747d430c33e998d...Paul Odeon2010-12-111-5/+5
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-117-134/+104
| |\
| | * spaces with underscores, I meanXavier Noria2010-12-111-1/+1