rails

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

Go to file

Mikel Lindsaar 12681c2a71 Merge branch 'master' of git://github.com/rails/rails

Conflicts:
	activemodel/README
	activemodel/lib/active_model/errors.rb
	activemodel/lib/active_model/serialization.rb
	railties/guides/source/3_0_release_notes.textile

2010-02-02 14:04:23 +11:00

actionmailer

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

2010-02-02 10:51:19 +11:00

actionpack

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

2010-02-02 14:04:23 +11:00

activemodel

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

2010-02-02 14:04:23 +11:00

activerecord

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

2010-02-02 10:51:19 +11:00

activeresource

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

2010-02-02 10:51:19 +11:00

activesupport

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

2010-02-02 14:04:23 +11: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 the Gemfile and CI build

2010-02-01 15:42:45 -08:00

doc/template

Horo rdoc template

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

railties

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

2010-02-02 14:04:23 +11: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

Update the Gemfile and CI build

2010-02-01 15:42:45 -08:00

load_paths.rb

Get rails tests running on bundler 0.9

2010-01-31 19:13:43 -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

Have rails depend on bundler

2010-01-31 19:35:11 -08:00

Rakefile

Bump arel dependency to 0.2.0 from 0.2.pre

2010-01-31 18:42:41 -08:00

release.rb

Use copy instead of export for release

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