rails

mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00

Go to file

Joshua Peek 1de95077dc Merge branch 'master' of github.com:rails/rails

Conflicts:
	railties/test/initializer/initialize_i18n_test.rb
	railties/test/initializer/path_test.rb

2009-12-21 20:41:25 -06:00

actionmailer

Fix ActionMailer. The fact that ActionMailer::Base does not inherit from AbstractController::Base is either a bug or we need to re-evaluate the requirements of the mixins.

2009-12-21 16:49:21 -08:00

actionpack

Dont introspect inline templates for the logger and cleanup a few styling issues

2009-12-21 16:03:04 -08:00

activemodel

Fully expand relative rails framework paths and make sure we aren't

2009-12-16 11:56:51 -06:00

activerecord

Missed changelog entry for :inverse_of

2009-12-21 13:18:11 -08:00

activeresource

Remove annoying and useless meta comments

2009-12-20 19:04:54 -06:00

activesupport

Missing acts_like dependency

2009-12-20 17:38:28 -08: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

Update CI bundler

2009-12-21 17:27:30 -06:00

doc/template

Horo rdoc template

2008-06-22 10:38:25 -07:00

rack @ adf996587a

Break up rails and railties:

2009-12-02 11:35:47 -08:00

railties

Merge branch 'master' of github.com:rails/rails

2009-12-21 20:41:25 -06: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

Ignore all pkg files

2009-12-02 11:35:48 -08:00

.gitmodules

Break up rails and railties:

2009-12-02 11:35:47 -08:00

Gemfile

Fix deprecated :vendored_at option

2009-12-17 12:02:19 -08: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

Break up rails and railties:

2009-12-02 11:35:47 -08:00

release.rb

Use copy instead of export for release

2008-09-05 14:22:56 +02:00