rails

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

Go to file

Pratik Naik e68bfaf1fe Merge remote branch 'mainstream/master'

Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb

2010-03-12 16:00:01 +00:00

actionmailer

Clean up the API required from ActionView::Template.

2010-03-09 13:12:11 +01:00

actionpack

Merge remote branch 'mainstream/master'

2010-03-12 16:00:01 +00:00

activemodel

Merge remote branch 'mainstream/master'

2010-03-12 16:00:01 +00:00

activerecord

Use arel 0.3.1, for srs

2010-03-10 14:04:10 -08:00

activeresource

Load RAILS_VERSION relative to the gemspec file.

2010-03-06 21:33:28 -08:00

activesupport

Merge remote branch 'mainstream/master'

2010-03-12 16:00:01 +00:00

Update CI to the latest bundler

2010-03-04 11:24:38 -08:00

doc/template

Horo rdoc template

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

railties

Merge remote branch 'mainstream/master'

2010-03-12 16:00:01 +00: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

Remove bin dir from .gitignore

2010-02-26 08:09:09 -08:00

Gemfile

Float arel on latest rails/arel

2010-03-10 16:10:45 -08:00

load_paths.rb

Define Bundler constant stub if bundler gem is not installed

2010-02-28 18:34:57 -06:00

rails3b.gemspec

Bump to Bundler 0.9.8. Remark on RubyGems 1.3.6 fix.

2010-02-25 16:55:42 -08:00

RAILS_VERSION

Read Rails version from a file instead of modifying the load path and doing requires

2010-03-04 21:25:52 -08:00

rails.gemspec

Rails requires Rubygems 1.3.6

2010-03-09 23:44:12 -08:00

Rakefile

Require AP::VERSION in order to install gems.

2010-03-10 14:32:02 +01:00

version.rb

Add rake update_versions task at root for quickly updating all components

2010-03-02 00:32:41 -05:00