提交 · 9fb51e76fd4f533748a4711c093f2dc7812a62a8 · 张重言 / rails

28 5月, 2011 10 次提交
- A
  Disable IdentityMap by default for ActiveRecord testing · 9fb51e76
  由 Akira Matsuda 提交于 5月 28, 2011
```
because enabling IM by default will possibly hide some bugs on 3.1 default behavior
```
  9fb51e76
- A
  
  stop using boolean expressions because of the side effects · c122c7b2
  由 Aaron Patterson 提交于 5月 27, 2011
  
  c122c7b2
- A
  Merge pull request #1365 from gnufied/sqlite3 · 4b536f75
  由 Aaron Patterson 提交于 5月 27, 2011
```
close statment only if its not closed
```
  4b536f75
- A
  Merge pull request #1229 from workmad3/master · 2a9b3abe
  由 Aaron Patterson 提交于 5月 27, 2011
```
Fix for Issue #1205
```
  2a9b3abe
- H
  
  delegate connection and column_hash calls directly to model · ed1a0672
  由 Hemant Kumar 提交于 5月 28, 2011
  
  ed1a0672
- H
  
  close statment only if its not closed · d48add71
  由 Hemant Kumar 提交于 5月 28, 2011
  
  d48add71
- A
  
  work around bug in the sqlite3 bindings. fixes #1289 · 985ace4d
  由 Aaron Patterson 提交于 5月 27, 2011
  
  985ace4d
- A
  Merge pull request #1346 from arunagw/jdom_file_from_xml_fix · 62d5ef0c
  由 Aaron Patterson 提交于 5月 27, 2011
```
Jdom file from xml fix
```
  62d5ef0c
- A
  
  fixing test for mysql2 · 8628948e
  由 Aaron Patterson 提交于 5月 27, 2011
  
  8628948e
- J
  Merge pull request #1359 from AndrewRadev/master · 4ae8381e
  由 José Valim 提交于 5月 27, 2011
```
Fix for ruby 1.8 bug with ActiveSupport::OrderedHash
```
  4ae8381e
27 5月, 2011 9 次提交
- A
  Fixes minor ruby 1.8 inconsistency · c9cc36bd
  由 Andrew Radev 提交于 5月 27, 2011
```
ActiveSupport::OrderedHash did not behave identically to Hash when given
a block with a splat.
```
  c9cc36bd
- A
  
  adding a test for #1322 · d1c74706
  由 Aaron Patterson 提交于 5月 26, 2011
  
  d1c74706
- J
  Merge pull request #1323 from fx/association_primary_key · 602fff1f
  由 Jon Leighton 提交于 5月 26, 2011
```
use association_primary_key in AssociationScope#add_constraints
```
  602fff1f
- J
  Merge pull request #1318 from TheEmpty/master · 09e431aa
  由 Jon Leighton 提交于 5月 26, 2011
```
Resolve issue #534
```
  09e431aa
- A
  
  Adding tests for file_from_xml for XmlMini_JDOM #jruby · 0094351a
  由 Arun Agrawal 提交于 5月 27, 2011
  
  0094351a
- A
  
  Adding __content__ into XmlMini_JDOM · d1646638
  由 Arun Agrawal 提交于 5月 27, 2011
  
  d1646638
- M
  
  Removes a now needless test - via Github · ded7e35c
  由 Mohammad Typaldos 提交于 5月 26, 2011
  
  ded7e35c
- J
  Merge pull request #1334 from bogdan/callback · 0731945e
  由 José Valim 提交于 5月 26, 2011
```
MassAssignmentSecurity: add ability to specify your own sanitizer
```
  0731945e
- J
  Merge pull request #1344 from jmileham/serialization_includes · d341d166
  由 José Valim 提交于 5月 26, 2011
```
AR Serialization shouldn't fall back to base opts for includes
```
  d341d166
26 5月, 2011 21 次提交
- J
  Don't merge base opts into includes when serializing ARs · 043b6243
  由 John Mileham 提交于 5月 26, 2011
```
Conflicts:

	activerecord/lib/active_record/serialization.rb
```
  043b6243
- J
  
  Failing test - JSON serialization shouldn't merge base opts into include opts. · 294e2a8c
  由 John Mileham 提交于 5月 26, 2011
  
  294e2a8c
- B
  MassAssignmentSecurity: add ability to specify your own sanitizer · c7567c9a
  由 Bogdan Gusiev 提交于 5月 26, 2011
```
Added an ability to specify your own behavior on mass assingment
protection, controlled by option:
ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer
```
  c7567c9a
- J
  Merge pull request #1328 from flippingbits/cleanup_engine_generator · 5083d70f
  由 José Valim 提交于 5月 26, 2011
```
Cleanup engine generator
```
  5083d70f
- M
  
  added assertion for non-standard primary_key on models used in the primary_key test · f4ed56df
  由 Marian Rudzynski 提交于 5月 26, 2011
  
  f4ed56df
- S
  
  Use global namespace Rails · 4686ace9
  由 Stefan Sprenger 提交于 5月 26, 2011
  
  4686ace9
- S
  
  Use plugin name consistently · 11862932
  由 Stefan Sprenger 提交于 5月 26, 2011
  
  11862932
- J
  Merge pull request #1324 from dmathieu/no_error_on_invalid_format · ec08bfc0
  由 José Valim 提交于 5月 26, 2011
```
Don't raise an exception if the format isn't recognized
```
  ec08bfc0
- D
  don't raise an exception if the format isn't recognized · 16571f9c
  由 dmathieu 提交于 5月 26, 2011
```
Fixed while traveling to heuruko
```
  16571f9c
- M
  
  use association_primary_key in AssociationScope#add_constraints · 1f7c3d02
  由 Marian Rudzynski 提交于 5月 26, 2011
  
  1f7c3d02
- J
  Merge pull request #1315 from ardavis/master · badc72f3
  由 José Valim 提交于 5月 25, 2011
```
Removed unnecessary space in application.rb
```
  badc72f3
- M
  
  Removes the restriction on primary key when joining in a habtm && test that it was properly removed · ec44763f
  由 Mohammad El-Abid 提交于 5月 26, 2011
  
  ec44763f
- A
  Merge pull request #1316 from guilleiguaran/railties-changelog · bf9272b9
  由 Aaron Patterson 提交于 5月 25, 2011
```
Updating Railties changelog
```
  bf9272b9
- G
  
  Updating Railties changelog · 433390de
  由 Guillermo Iguaran 提交于 5月 25, 2011
  
  433390de
- A
  
  Added a space to the comment_if helper for formatting purposes · 60ca8d95
  由 Andrew Davis 提交于 5月 25, 2011
  
  60ca8d95
- A
  
  Accidentally added extra IDE files, removed them. · 06322952
  由 Andrew Davis 提交于 5月 25, 2011
  
  06322952
- A
  
  Removed unnecessary space in application.rb for formatting · 3b23759a
  由 Andrew Davis 提交于 5月 25, 2011
  
  3b23759a
- J
  Merge pull request #1312 from joshk/remove_active_support_deprecations · 9b679187
  由 José Valim 提交于 5月 25, 2011
```
Removed deprecated methods and related tests from ActiveSupport
```
  9b679187
- J
  
  Removed deprecated methods and related tests from ActiveSupport · 9cafc288
  由 Josh Kalderimis 提交于 5月 25, 2011
  
  9cafc288
- J
  Merge pull request #1311 from kuldarkrabbi/master · 7fd0a6de
  由 José Valim 提交于 5月 25, 2011
```
action_view/template/handler.rb has been removed
```
  7fd0a6de
- K
  
  action_view/template/handler has been removed · 9a683337
  由 Kuldar Krabbi 提交于 5月 25, 2011
  
  9a683337