Commit Graph

12080 Commits

Author SHA1 Message Date
Pratik Naik
783caae52f Use Arel::Attribute for pk conditions 2010-01-01 01:00:18 +05:30
Pratik Naik
93555c672e Add Relation#table to get the relevant Arel::Table 2010-01-01 00:56:49 +05:30
Pratik Naik
d5f9173926 Add Relation#delete [Pratik Naik, Emilio Tagua] 2010-01-01 00:17:40 +05:30
David Heinemeier Hansson
ea41a757aa Dont gitkeep things that are gitignored 2009-12-31 11:09:10 -05:00
Jeremy Kemper
16f1a2b573 Clarify assertion 2009-12-30 23:21:10 -08:00
David Heinemeier Hansson
96c27e4003 Merge branch 'master' of github.com:rails/rails 2009-12-31 01:15:30 -05:00
Jeremy Kemper
c4c2502df8 Fix controller runtime test 2009-12-30 22:15:02 -08:00
David Heinemeier Hansson
5d8342cc32 Added .gitkeep to empty directories and --skip-git to skip gitignore/gitkeep files 2009-12-31 01:14:23 -05:00
Carl Lerche
d39d7f5f44 Allow ActiveSupport's isolation tests to run with MiniTest on 1.9 2009-12-30 20:48:46 -08:00
David Heinemeier Hansson
5eb3ceca01 Orphan experiment no longer needed 2009-12-30 22:55:52 -05:00
Jeremy Kemper
1fbd02e446 Revert "Add config.action_controller.include behavior to plugins."
This reverts commit 7e8b7f46bf.

Conflicts:

	railties/lib/rails/plugin.rb
2009-12-30 19:34:15 -08:00
Jeremy Kemper
10a2638db0 Fix up AR extension by using Railties module instead of Rails and requiring ControllerRuntime at initialization time instead of boot 2009-12-30 19:24:00 -08:00
Jeremy Kemper
d349b22097 Remove self-require 2009-12-30 19:00:12 -08:00
Jeremy Kemper
8ad9d14494 Partially revert "ActionDispatch should require as little of ActiveSupport as possible"
Removes load path change from commit bb153f42e4.
2009-12-30 17:35:17 -08:00
Jeremy Kemper
1a0c372b19 depends on Module#attr_internal 2009-12-30 14:31:02 -08:00
Jeremy Kemper
3a29aa3abc Merge commit 'josevalim/arlog' 2009-12-30 14:01:05 -08:00
Jeremy Kemper
0c7c842d8f Merge branch 'master' of github.com:rails/rails 2009-12-30 14:01:00 -08:00
Jeremy Kemper
17787fbfdb Merge commit 'josevalim/callbacks' 2009-12-30 13:48:20 -08:00
José Valim
cb3c0d490b Get rid of DeprecatedCallbacks in ActiveRecord::Associations and finally remove it. 2009-12-30 13:40:37 -08:00
José Valim
a6e2d16b1e Setup and teardown now use new callbacks. 2009-12-30 13:40:37 -08:00
Carl Lerche
bb153f42e4 ActionDispatch should require as little of ActiveSupport as possible 2009-12-30 12:58:40 -08:00
Pratik Naik
7aabaac0f5 Organize Relation methods into separate modules 2009-12-30 19:29:26 +05:30
José Valim
4ecdf24bde Kick AR logging back to life and move ControllerRuntime inside ActiveRecord::Rails. 2009-12-30 13:07:48 +01:00
José Valim
97a64b6b22 Get rid of DeprecatedCallbacks in ActiveRecord::Associations and finally remove it. 2009-12-30 11:43:34 +01:00
José Valim
e58ad8ed9c Setup and teardown now use new callbacks. 2009-12-30 11:09:27 +01:00
Jeremy Kemper
97204fc0bc Merge commit 'mikel/master' 2009-12-30 00:18:41 -08:00
Pratik Naik
8734f9a271 Relation#many? shoud load the records if there's a LIMIT 2009-12-30 12:14:00 +05:30
Pratik Naik
bdf59a5618 Add Relation#any? and Relation#many? 2009-12-30 12:11:22 +05:30
Mikel Lindsaar
345e622a20 Adding TMailCompat layer for :set_content_type and friends 2009-12-30 16:12:51 +11:00
Pratik Naik
a56518aee2 Fix the count test for postgres 2009-12-30 10:41:47 +05:30
Jeremy Kemper
79550e8995 Revert "Add default respond_to formats to ApplicationController."
(Needs consensus that these are appropriate defaults.)

This reverts commit 66604b2e0e.
2009-12-29 19:11:00 -08:00
Carl Lerche
e5c88434db Use the correct method for eager loading autoloads 2009-12-29 19:04:37 -08:00
Jeremy Kemper
153ce2f328 Clean up changelog a bit 2009-12-29 15:50:47 -08:00
Jeremy Kemper
71ffa76070 Merge branch 'mail' 2009-12-29 15:49:04 -08:00
Jeremy Kemper
ce1aeeee3f Move mail gem dep to Action Mailer's gemspec 2009-12-29 15:47:28 -08:00
Jeremy Kemper
b27a3e8da3 Merge branch 'master' of git://github.com/mikel/rails into mail
Conflicts:
	actionmailer/lib/action_mailer.rb
2009-12-29 15:46:12 -08:00
Jeremy Kemper
485d244eae Merge branch 'master' of github.com:rails/rails 2009-12-29 15:38:17 -08:00
José Valim
0b37572552 Clean up railties Rakefile from old responsibilities which are now part of main Rakefile 2009-12-29 23:58:44 +01:00
José Valim
1a4d909c68 Add rails app --edge and rails app --dev 2009-12-29 23:58:34 +01:00
José Valim
66604b2e0e Add default respond_to formats to ApplicationController. 2009-12-29 23:58:25 +01:00
Sam Pohlenz
468bdb3ed8 Make plugins responsible for loading their own rake tasks
Signed-off-by: Carl Lerche <carllerche@mac.com>
2009-12-29 14:47:48 -08:00
Sam Pohlenz
cbce027669 Application object should instantiate non-vendored plugins
Signed-off-by: Carl Lerche <carllerche@mac.com>
2009-12-29 14:45:43 -08:00
Carl Lerche
2e87196d14 Use extlib_inheritable_accessor in request_forgery_protection.rb.
For some reason the current class_inheritable_accessor does not play nice with included hooks. class_inheritable_accessor will be revised shortly.
2009-12-29 13:21:36 -08:00
Carl Lerche
3cb7e04763 Finally remove rails/initializer.rb 2009-12-29 13:20:10 -08:00
Pratik Naik
f17bb1fbff Simplify get_projection_name_from_chained_relations using recursion 2009-12-30 01:16:24 +05:30
Emilio Tagua
00cd3789f6 Relation#count should look for projections in chained relations and perform the count on the given column
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-12-30 01:12:38 +05:30
Carl Lerche
aa1b32ae97 Check to see if the plugin object responds to load_tasks (vendor/plugin/* does not yet) Fixes Sam Ruby's tests. 2009-12-29 10:49:12 -08:00
Pratik Naik
0dea509817 Oops, add the missing #tap call 2009-12-29 15:54:40 +05:30
Pratik Naik
3b8853eda4 Replace Base#safe_to_array with Array.wrap 2009-12-29 15:53:06 +05:30
Pratik Naik
0a1ff1a14f Rewrite Relation#readonly, eager_load, preload using Object#tap 2009-12-29 15:28:40 +05:30