kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity
Ruby on Rails
9,711 Commits 72 Branches 493 Tags 355 MiB
Ruby 95%
JavaScript 4%
HTML 0.6%
CSS 0.3%
Go to file
Yehuda Katz + Carl Lerche 00a9d4b91c Merge branch 'master' into wip_abstract_controller 
Conflicts:
	actionpack/lib/action_controller/abstract/callbacks.rb
	actionpack/lib/action_controller/abstract/renderer.rb
	actionpack/lib/action_controller/base/base.rb
	actionpack/lib/action_controller/dispatch/dispatcher.rb
	actionpack/lib/action_controller/routing/route_set.rb
	actionpack/lib/action_controller/testing/process.rb
	actionpack/test/abstract_controller/layouts_test.rb
	actionpack/test/controller/filters_test.rb
	actionpack/test/controller/helper_test.rb
	actionpack/test/controller/render_test.rb
	actionpack/test/new_base/test_helper.rb
 		2009-05-11 17:07:05 -07:00
actionmailer Fixes ActionMailer to work with the ActionView refactoring 2009-04-27 12:34:25 -07:00
actionpack Merge branch 'master' into wip_abstract_controller 2009-05-11 17:07:05 -07:00
activemodel Cherry-pick the inflector only 2009-05-05 21:40:53 -07:00
activerecord Revert "Fixed bug with polymorphic has_one :as pointing to an STI record" 2009-05-11 12:20:54 -07:00
activeresource Defer rake/contrib/sshpublisher require so basic tasks don't need the full rake gem 2009-05-07 18:27:50 -07:00
activesupport Merge branch 'master' into wip_abstract_controller 2009-05-11 17:07:05 -07:00
ci Updated for Rack 1.0 2009-04-25 12:33:14 -07:00
doc/template Horo rdoc template 2008-06-22 10:38:25 -07:00
railties Added db/seeds.rb as a default file for storing seed data for the database. Can be loaded with rake db:seed (or created alongside the db with db:setup). (This is also known as the "Stop Putting Gawd Damn Seed Data In Your Migrations" feature) [DHH] 2009-05-11 19:08:13 +02:00
tools Tool for profiling resource usage in each require call. 2009-05-07 12:10:26 -07:00
.gitignore Bring abstract_controller up to date with rails/master 2009-04-13 15:18:45 -07:00
Rakefile Get Active Model in the mix 2009-04-22 01:02:54 -07:00
pushgems.rb No more svn version numbers to rely on, use timestamps instead 2008-05-11 18:21:47 -05:00
release.rb Use copy instead of export for release 2008-09-05 14:22:56 +02:00