Commit Graph

21408 Commits

Author SHA1 Message Date
Akira Matsuda
22faa2c86d wrong SQL statement 2011-03-06 03:29:23 +09:00
Xavier Noria
9092052cb0 merges rails 2011-03-05 12:06:43 +01:00
Xavier Noria
2076817629 revises the RDoc of Hash#reverse_merge 2011-03-05 11:57:32 +01:00
Xavier Noria
f6a5449d43 copy-edits 819762c
* simplifies some sentences
* use a more neutral language with less you/yours
2011-03-05 11:57:32 +01:00
Xavier Noria
5f99a899a8 copy-edits 108561f 2011-03-05 11:57:32 +01:00
JudeArasu
b12a4a9296 typo changes 2011-03-05 11:57:32 +01:00
R.T. Lechow
737abe4b4d Railties typos. 2011-03-05 11:56:35 +01:00
R.T. Lechow
87e9e3f9af Action Pack typos. 2011-03-05 11:56:35 +01:00
R.T. Lechow
a1b4d8e7b2 Active Record typos. 2011-03-05 11:56:34 +01:00
R.T. Lechow
273700cbd0 Active Support typos. 2011-03-05 11:56:34 +01:00
R.T. Lechow
48841dd6ae Active Resource typos. 2011-03-05 11:56:34 +01:00
R.T. Lechow
86c15d8b89 Active Model typos. 2011-03-05 11:56:34 +01:00
tashian
e95b965926 Properly escaped a + in the dynamic segments TIP 2011-03-05 11:56:33 +01:00
Jonathon D. Jones
3eca9d5b43 Adds link to Object.blank? from Object.present? 2011-03-05 11:56:33 +01:00
mjy
045ca30394 fixes a missmatched column in example 2011-03-05 11:56:33 +01:00
JudeArasu
d735672aa5 Spelling mistake 2011-03-05 11:56:33 +01:00
Dalibor Nasevic
3457db712e Correct spelling for Base64 in action_mailer 2011-03-05 11:56:33 +01:00
Dalibor Nasevic
3673a6981e Removed link to un-existing Issues page on Github 2011-03-05 11:56:33 +01:00
Lars Smit
9b01284c3e Added some new advice on applying patches 2011-03-05 11:56:32 +01:00
Ben Orenstein
67af97c4c1 Fix incorrect example. 2011-03-05 11:56:32 +01:00
Ben Orenstein
ea6a2b7c11 Fix incorrect word. 2011-03-05 11:56:32 +01:00
Rodrigo Navarro
3f97f056f9 Pointing out that dynamic_form plugin must be installed to be able to use error_messages and error_messages_for view helpers. 2011-03-05 11:56:32 +01:00
Ben Orenstein
eef713dd66 Clean up wording. 2011-03-05 11:56:31 +01:00
Vijay Dev
e15973ce7c use resources in place of map.resources 2011-03-05 11:56:31 +01:00
Ben Orenstein
f305c60816 Clarify comment by removing french reference ('a la'). Should improve readability for non-native english speakers. 2011-03-05 11:56:31 +01:00
Ben Orenstein
ac4c5e9722 Example descriptions and their examples were flipped. Fix. 2011-03-05 11:56:31 +01:00
Ben Orenstein
8f526b30f4 Warn people that these methods are deprecated. 2011-03-05 11:56:31 +01:00
Ben Orenstein
4c27ad0c23 Correct example that did not do what it claimed. Rework explanation. 2011-03-05 11:56:30 +01:00
Ilya Zayats
feec2250bb added information about TEST_DIR env variable 2011-03-05 11:56:30 +01:00
JudeArasu
34f5628a07 commas to set off expressions that interrupt sentence flow 2011-03-05 06:19:17 +05:30
JudeArasu
3463247da5 typo changes 2011-03-05 06:10:35 +05:30
JudeArasu
a48f46d4fc typo changes 2011-03-05 06:08:21 +05:30
Xavier Noria
3b10b8a201 implements ActiveRecord::Base.connection_config to be able to check the configuration of the current connection at runtime 2011-03-05 01:35:02 +01:00
Santiago Pastorino
28f1c21b50 Fix CI 2011-03-04 21:38:38 -02:00
Jon Leighton
8987cda2bb When preloading has_and_belongs_to_many associations, we should only instantiate one AR object per actual record in the database. (Even when IM is off.) 2011-03-04 15:16:07 -08:00
Jon Leighton
af27262ec3 Fix a couple of tests in join_model_test.rb which were failing when the identity map is turned off 2011-03-04 14:49:19 -08:00
Jon Leighton
4206eff189 Stop identity-mapping the through records in the preloader since I fixed the underlying problem in the habtm preloader. 2011-03-04 22:36:44 +00:00
Jon Leighton
b5b5558d2f Fix a couple of tests in join_model_test.rb which were failing when the identity map is turned off 2011-03-04 22:35:46 +00:00
Jon Leighton
73c0b390b3 When preloading has_and_belongs_to_many associations, we should only instantiate one AR object per actual record in the database. (Even when IM is off.) 2011-03-04 22:33:16 +00:00
Santiago Pastorino
056f05adcd Make CI test with and without IM 2011-03-04 19:03:47 -02:00
Jon Leighton
a5ef8b9fa0 Merge branch 'master' into nested_has_many_through 2011-03-04 20:36:11 +00:00
Diego Carrion
1f47061b48 reverted tests deleted by 080345baca1076a9788d, refactored implementations should not invalidate the validations
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2011-03-04 18:07:48 -02:00
Diego Carrion
7872cc992b refactored Time#<=> and DateTime#<=> by removing unnecessary calls without losing performance
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2011-03-04 16:50:24 -02:00
Alexander Uvarov
0db915efd1 Add an option to FormBuilder to omit hidden field with id
[#4551 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2011-03-04 16:38:08 -02:00
José Valim
f00a398456 log and readme should respect --quiet 2011-03-04 13:05:27 +01:00
Jon Leighton
735844db71 Merge branch 'master' into nested_has_many_through
Conflicts:
	activerecord/CHANGELOG
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/class_methods/join_dependency.rb
	activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
	activerecord/lib/active_record/associations/has_many_association.rb
	activerecord/lib/active_record/associations/has_many_through_association.rb
	activerecord/lib/active_record/associations/has_one_association.rb
	activerecord/lib/active_record/associations/has_one_through_association.rb
	activerecord/lib/active_record/associations/through_association_scope.rb
	activerecord/lib/active_record/reflection.rb
	activerecord/test/cases/associations/has_many_through_associations_test.rb
	activerecord/test/cases/associations/has_one_through_associations_test.rb
	activerecord/test/cases/reflection_test.rb
	activerecord/test/cases/relations_test.rb
	activerecord/test/fixtures/memberships.yml
	activerecord/test/models/categorization.rb
	activerecord/test/models/category.rb
	activerecord/test/models/member.rb
	activerecord/test/models/reference.rb
	activerecord/test/models/tagging.rb
2011-03-04 09:30:27 +00:00
R.T. Lechow
c8dae23a2a Railties typos. 2011-03-04 01:01:50 -05:00
R.T. Lechow
12325cf970 Action Pack typos. 2011-03-04 01:01:48 -05:00
R.T. Lechow
238e6f0c6e Active Record typos. 2011-03-04 01:01:45 -05:00
R.T. Lechow
80e3beb24b Active Support typos. 2011-03-04 01:01:42 -05:00