aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:mikel/railsJosé Valim and Mikel Lindsaar2010-01-2459-914/+1214
|\
| * Merge branch 'master' of git://github.com/rails/railsJosé Valim and Mikel Lindsaar2010-01-2559-914/+1214
| |\
| | * Revamp of Rails documentation taskRizwan Reza2010-01-241-23/+31
| | * Fix a couple failures on 1.9.1.José Valim2010-01-242-5/+7
| | * Use Rails::Application ref in Rakefile and console scripts.Joshua Peek2010-01-243-3/+3
| | * Add Rails::Application pointer to the default app to add symmetry to Foo::App...Joshua Peek2010-01-242-2/+6
| | * Fix failing tests after merge.José Valim2010-01-246-8/+13
| | * Ensure metals and initializers in plugins are loaded.José Valim2010-01-2410-29/+75
| | * Add tests for plugin sanity check.José Valim2010-01-243-3/+27
| | * Rename plugin_name to railtie_name and engine_name.José Valim2010-01-2410-23/+19
| | * Ensure environment config has higher priority than application ones.José Valim2010-01-243-3/+16
| | * Ensure helpers work from configured path.José Valim2010-01-244-11/+12
| | * Ensure namespaced controllers in engines work.José Valim2010-01-244-22/+49
| | * Add I18n tests to engines.José Valim2010-01-243-56/+40
| | * Load deprecated tasks for plugins.José Valim2010-01-242-0/+45
| | * Make plugin generator compatible with new schema.José Valim2010-01-243-2/+2
| | * Solve some pendencies.José Valim2010-01-2410-29/+38
| | * Move console stuff to its own directory.José Valim2010-01-235-6/+6
| | * Merge branch 'master' into appJosé Valim2010-01-2355-890/+303
| | |\
| | * | Move configuration to subfolders.José Valim2010-01-2314-235/+252
| | * | Create configurable modules and ensure that they are added only on direct chi...José Valim2010-01-236-81/+128
| | * | Plugin is now an Engine.José Valim2010-01-235-61/+46
| | * | First steps into making Plugin < Engine.José Valim2010-01-235-11/+36
| | * | Extract Railtie load from application.José Valim2010-01-236-46/+83
| | * | Break application.rb file in smaller chunks.José Valim2010-01-233-102/+110
| | * | Extract routes reloading responsibilities from application and load them just...José Valim2010-01-238-71/+77
| | * | Ensure user set load paths have higher preference and move Bootstrap inside A...José Valim2010-01-237-108/+105
| | * | Get rid of initializers global and create i18n railtie.José Valim2010-01-2314-325/+256
| | * | Moved more configuration away from bootstrap.José Valim2010-01-229-95/+81
| | * | Got tests working once again.José Valim2010-01-227-48/+40
| | * | Add view paths to Engine setup.José Valim2010-01-227-51/+62
| | * | Massive cleanup in Railties and load stack.José Valim2010-01-218-222/+322
| | * | Add test case for load initializers before routing behavior.Prem Sichanugrist2010-01-211-0/+28
* | | | Ensure implicit multipart templates with locale works as expected.José Valim and Mikel Lindsaar2010-01-246-0/+36
* | | | Speed up some Hash core extensions.José Valim and Mikel Lindsaar2010-01-242-16/+12
* | | | Remove deprecated behavior since 2.3.José Valim and Mikel Lindsaar2010-01-242-30/+1
* | | | Add uniq_by and uniq_by! to Array.José Valim and Mikel Lindsaar2010-01-243-3/+41
|/ / /
* | | Add tests to mail helper.José Valim and Mikel Lindsaar2010-01-2411-141/+86
* | | Move old tests to a specific folder and add some delivery method tests.José Valim and Mikel Lindsaar2010-01-2416-73/+131
* | | Handle some TODOs and deprecations.José Valim and Mikel Lindsaar2010-01-246-40/+45
* | | Finish cleaning up delivery methods implementation.José Valim and Mikel Lindsaar2010-01-244-82/+66
* | | Maintain old_api and deprecated_api in different files.José Valim and Mikel Lindsaar2010-01-244-243/+261
* | | Add new class delivery method API.José Valim and Mikel Lindsaar2010-01-2412-271/+259
* | | Some refactoring.José Valim and Mikel Lindsaar2010-01-244-164/+164
* | | Adding failing tests for calling just the action, instead of :create_action_n...José Valim and Mikel Lindsaar2010-01-242-2/+18
* | | Moving AS::Notifications call to one location in baseJosé Valim and Mikel Lindsaar2010-01-242-14/+9
* | | Delegated ActionMailer::Base.deliveries to Mail.deliveries, added callback su...José Valim and Mikel Lindsaar2010-01-2411-49/+70
* | | Set sort order for explicit parts from the collector's template sequenceJosé Valim and Mikel Lindsaar2010-01-242-14/+17
* | | Add some tests to collector with templates and any.José Valim and Mikel Lindsaar2010-01-235-14/+50
* | | Make implicit and explicit templates pass through the same part creation proc...José Valim and Mikel Lindsaar2010-01-233-84/+104