José Valim f915f9e339 Merge branch 'master' into app ... Conflicts: railties/lib/rails/application.rb		2010-01-23 22:53:26 +01:00
actionmailer	Moved more configuration away from bootstrap.	2010-01-22 20:44:38 +01:00
actionpack	Merge branch 'master' into app	2010-01-23 22:53:26 +01:00
activemodel	Stop overriding LoadError.new to return a MissingSourceError (and sometimes nil!)	2010-01-19 22:35:26 -08:00
activerecord	Merge branch 'master' into app	2010-01-23 22:53:26 +01:00
activeresource	Moved more configuration away from bootstrap.	2010-01-22 20:44:38 +01:00
activesupport	Get rid of initializers global and create i18n railtie.	2010-01-23 01:29:29 +01:00
arel@0faeb50474	Temporarily add submodules to the Rails repo for Arel and Rack::Mount. These submodules will be removed once we add proper Gemfile following to bundler	2009-11-16 12:30:06 -08:00
ci	Update CI bundler	2009-12-21 17:27:30 -06:00
doc/template	Horo rdoc template	2008-06-22 10:38:25 -07:00
railties	Merge branch 'master' into app	2010-01-23 22:53:26 +01:00
tools	Rename tools/profile_requires -> tools/profile since we do both require and ruby-prof profiling.	2009-05-27 01:11:33 -05:00
.gitignore	Set a good example, no system ignores in project ignore file	2010-01-13 20:26:01 -06:00
.gitmodules	Remove rack submodule, 1.1 has been released as a gem.	2010-01-04 10:09:10 -06:00
Gemfile	Move I18n to gemspec and update dependencies.	2010-01-15 23:48:38 +01:00
pushgems.rb	No more svn version numbers to rely on, use timestamps instead	2008-05-11 18:21:47 -05:00
rails.gemspec	Break up rails and railties:	2009-12-02 11:35:47 -08:00
Rakefile	rake smoke: toplevel task to quickly smoke-test all projects	2009-12-28 12:29:03 -08:00
release.rb	Use copy instead of export for release	2008-09-05 14:22:56 +02:00