aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsJosé Valim and Mikel Lindsaar2010-01-2544-832/+1105
|\
| * 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
| * Ensure metals and initializers in plugins are loaded.José Valim2010-01-249-26/+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-243-15/+11
| * Ensure environment config has higher priority than application ones.José Valim2010-01-243-3/+16
| * Ensure helpers work from configured path.José Valim2010-01-242-2/+1
| * Ensure namespaced controllers in engines work.José Valim2010-01-243-1/+42
| * Add I18n tests to engines.José Valim2010-01-242-56/+38
| * 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-249-28/+37
| * Move console stuff to its own directory.José Valim2010-01-235-6/+6
| * Merge branch 'master' into appJosé Valim2010-01-2315-27/+14
| |\
| * | 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-236-58/+72
| * | 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-2312-325/+225
| * | Moved more configuration away from bootstrap.José Valim2010-01-224-75/+41
| * | Got tests working once again.José Valim2010-01-227-48/+40
| * | Add view paths to Engine setup.José Valim2010-01-225-47/+60
| * | Massive cleanup in Railties and load stack.José Valim2010-01-217-216/+322
| * | Add test case for load initializers before routing behavior.Prem Sichanugrist2010-01-211-0/+28
* | | Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-01-2317-28/+49
|\ \ \ | | |/ | |/|
| * | I removed the rdoc task from plugin RakefileJoshua Peek2010-01-221-1/+1
| * | Delegate App calls to instanceJoshua Peek2010-01-225-5/+11
| * | Add test case for load initializers before routing behavior.Prem Sichanugrist2010-01-221-0/+28
| * | Use expand_path to require environment in metal templateJoshua Peek2010-01-221-1/+1
| * | Include cascade header in metal templateJoshua Peek2010-01-221-1/+1
| * | lib is already included w/ rake test taskJoshua Peek2010-01-221-2/+0
| * | Remove rdoc task from generated plugin RakefileJoshua Peek2010-01-221-10/+0
| * | Template whitespaceJoshua Peek2010-01-228-8/+7
| |/
* | Fixing typo in config.frameworks errorMikel Lindsaar2010-01-221-1/+1
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim and Mikel Lindsaar2010-01-2216-91/+103
|\|
| * Make filter parameters based on request, so they can be modified for anything...José Valim2010-01-214-8/+6
| * Give higher priority to rails generators.José Valim2010-01-214-9/+23
| * Default to sync instrumentation.José Valim2010-01-218-81/+61
| * Don't let generators die if rubygems puts crap in your load path.José Valim2010-01-211-1/+3
| * Tidy up new filter_parameters implementation.José Valim2010-01-213-5/+3
| * Add deprecation warning for calling filter_parameter_logging ActionController...Prem Sichanugrist2010-01-213-0/+20
* | Updating functional tests to not compare equality with encoded, Mail::Message...José Valim and Mikel Lindsaar2010-01-221-1/+1
|/
* fixes the failure of config.plugins without :all option tests [#3718 status:r...Santiago Pastorino2010-01-201-4/+3