Commit Graph

22410 Commits

Author SHA1 Message Date
Jon Leighton
1dd90f8f12 Don't use select() values from the join model of a through association. Fixes #508. 2011-05-11 08:56:01 +01:00
Jon Leighton
aa1fc1c88c Bring back obj.association_loaded? as a deprecated method. Fixes #472. 2011-05-11 08:56:01 +01:00
Jon Leighton
6d51f9b98c Merge pull request #509 from gucki/master
fix bug in usage example of #unscoped
2011-05-11 00:31:43 -07:00
Corin Langosch
2bfeda3f09 fix bug in usage example of #unscoped 2011-05-11 09:19:12 +02:00
José Valim
4a6855e183 Merge pull request #507 from dlee/fix_identity_map_tests
Fix tests to reflect IdentityMap no longer default
2011-05-10 23:30:53 -07:00
José Valim
a792ad6db9 Merge pull request #506 from dlee/custom_csrf_token_tests
Test csrf token param name customization
2011-05-10 23:30:32 -07:00
José Valim
af88daefe0 Merge pull request #503 from smartinez87/conventions
Follow code conventions on some tests
2011-05-10 23:26:12 -07:00
David Lee
828f171536 Fix tests to reflect IdentityMap no longer default
Broke in 0e1dcae1857db4f6721561caff38d8be748d0b40
2011-05-10 19:21:32 -07:00
David Lee
8366cabd65 Test csrf token param name customization 2011-05-10 18:24:14 -07:00
Sebastian Martinez
21b61a8ac4 Follow code conventions on some tests 2011-05-10 20:58:36 -03:00
José Valim
fa187ec778 Merge pull request #501 from guilleiguaran/patch-2
Adding .sass-cache to gitignore template
2011-05-10 15:52:07 -07:00
Guillermo Iguaran
e78221f92d Adding .sass-cache to gitignore template 2011-05-10 15:46:03 -07:00
Jon Leighton
a8c1fa4afd Add test to specify that attributes from an association's conditions should be assigned without mass-assignment protection when a record is built on the association. 2011-05-10 23:35:15 +01:00
Jon Leighton
93a85ce333 Remove unnecessary '|| {}' 2011-05-10 23:35:15 +01:00
José Valim
a87894ae57 Get around weird missing constant error caused by AS instead of simply raising NameError, closes #477. 2011-05-11 00:08:43 +02:00
Jon Leighton
9a7dbe2c05 Don't use mass-assignment protection when applying the scoped.scope_for_create. Fixes #481. 2011-05-10 22:54:40 +01:00
Aaron Patterson
8f999a3f80 make sure log file is written in binary mode. fixes #497 2011-05-10 13:23:05 -07:00
José Valim
7b6819f985 Merge pull request #499 from smartinez87/csv
impact guides with no CSV fixture support
2011-05-10 13:09:25 -07:00
Sebastian Martinez
177f7fa7b1 impact guides with no CSV fixture support 2011-05-10 16:55:32 -03:00
David Heinemeier Hansson
8567ab9098 Need it declared too 2011-05-10 14:30:02 -05:00
David Heinemeier Hansson
de286206c3 Include lib/assets for sprocket paths 2011-05-10 14:23:18 -05:00
José Valim
1a844650a4 Merge pull request #498 from vatrai/minor_cleaning
minor cleaning with new api method all
2011-05-10 12:12:19 -07:00
Vishnu Atrai
9a0e3d44d1 minor cleaning with new api method 2011-05-11 00:15:16 +05:30
Aaron Patterson
558334a899 deprecating CSV fixture support 2011-05-10 11:08:18 -07:00
Aaron Patterson
714fea81e4 deprecating read_csv_fixture_files method 2011-05-10 11:08:18 -07:00
Piotr Sarnacki
2ea33d6b47 Merge pull request #490 from vijaydev/patch-4
Replace LH with GitHub url for filing issues
2011-05-10 10:58:12 -07:00
Piotr Sarnacki
9f0af6d6dd Merge pull request #495 from vatrai/minor_fixes
minor cleaning
2011-05-10 10:57:15 -07:00
Vishnu Atrai
33f0b6b67d minor cleaning 2011-05-10 22:51:54 +05:30
José Valim
8660433537 Merge pull request #494 from vijaydev/patch-5
Use all in place of find(:all)
2011-05-10 10:13:23 -07:00
Vijay Dev
e2390c08ce Use all in place of find(:all) 2011-05-10 10:08:31 -07:00
Aaron Patterson
134a05adcb Merge pull request #493 from guilleiguaran/changelog-fixes
Merging 3.0.x CHANGELOGs
2011-05-10 10:04:54 -07:00
Guillermo Iguaran
259c749de1 Merging 3.0.x CHANGELOGs 2011-05-10 11:51:35 -05:00
José Valim
ceaf73a503 Merge pull request #492 from jaw6/master
Serialized methods that return nil should not be considered YAML
2011-05-10 09:41:28 -07:00
Vijay Dev
8265c45db3 Replace LH with GitHub url for filing issues 2011-05-10 09:25:52 -07:00
David Heinemeier Hansson
4de977117f Update sprocket comments 2011-05-10 11:23:35 -05:00
Joshua Wehner
2cef2d411a Methods that return nil should not be considered YAML 2011-05-10 12:06:09 -04:00
Xavier Noria
8e55afb453 Merge pull request #487 from vijaydev/patch-3
s/javascript/JavaScript
2011-05-10 09:00:54 -07:00
Vijay Dev
c3c852c2d8 s/javascript/JavaScript 2011-05-10 08:51:50 -07:00
José Valim
3aa8f348ef Fix previous commit by allowing a proc to be given as response_body. This is deprecated and is going to be removed in future releases. 2011-05-10 16:53:57 +02:00
José Valim
4d5ce4738b Merge pull request #446 from danielstutzman/response_body_is_proc
New test: setting response_body to a Proc should be supported.
2011-05-10 07:38:43 -07:00
José Valim
fa8b0f44bd Merge pull request #484 from slainer68/master
Puts ActiveRecord::SessionStore attributes in white list, fixes #483
2011-05-10 07:23:26 -07:00
slainer68
95b4989559 Puts ActiveRecord::SessionStore attributes in white list, fixes #483 2011-05-10 16:11:28 +02:00
José Valim
8c05293b69 Merge pull request #482 from vijaydev/patch-2
Fix typos in IM documentation
2011-05-10 04:06:10 -07:00
Vijay Dev
a4765f74cd Fix typos in IM documentation 2011-05-10 03:44:57 -07:00
José Valim
302c912bf6 Document identity map inconsistency with associations, closes #474. 2011-05-10 11:33:39 +02:00
José Valim
5fc3564a50 Fix #480. Passing nil to create association works. 2011-05-10 11:18:16 +02:00
José Valim
0ceb21e335 Revert "b9ea751d0e56bd00d341766977a607ed3f7ddd0f".
Wrapping each Record.associations.build in a transaction is going to
make several unneeded queries. Reverting this commit also fixes #479.
2011-05-10 11:14:39 +02:00
José Valim
7c353d576a Add failing tests according to #479. 2011-05-10 11:11:30 +02:00
José Valim
b6a2113b8d Add failing tests, according to #480. 2011-05-10 11:02:34 +02:00
José Valim
9e4b715d79 Ensure assign_attributes and update_attributes do not fail on nil, closes #478. 2011-05-10 10:30:27 +02:00