提交 · 4f234bfd799f471490775a2843b3cf7db2af21ed · 张重言 / rails

30 5月, 2011 1 次提交
- L
  
  Corrected some typos and American vs. Queen's English issues · 4f234bfd
  由 Lee Reilly 提交于 5月 29, 2011
  
  4f234bfd
29 5月, 2011 6 次提交
- A
  Merge pull request #1384 from amatsuda/simplify_drop_table · 18b153d1
  由 Aaron Patterson 提交于 5月 28, 2011
```
Remove unused options from drop_table
```
  18b153d1
- J
  Merge pull request #1380 from vijaydev/session_migration · a1b1f91e
  由 José Valim 提交于 5月 28, 2011
```
Use 3.1 style migration for sessions table
```
  a1b1f91e
- J
  Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-tests · a46b03e7
  由 José Valim 提交于 5月 28, 2011
```
Stringify param values in controller tests.
```
  a46b03e7
- A
  
  No need to pass options which is never used · bcb466c5
  由 Akira Matsuda 提交于 5月 29, 2011
  
  bcb466c5
- A
  
  No need to override for just calling super · d8f49888
  由 Akira Matsuda 提交于 5月 29, 2011
  
  d8f49888
- V
  
  Use change in place of up and down in sessions table migration · 995ea003
  由 Vijay Dev 提交于 5月 28, 2011
  
  995ea003
28 5月, 2011 21 次提交
- J
  Merge pull request #1378 from AndrewRadev/master · 2fd7ea97
  由 José Valim 提交于 5月 28, 2011
```
Add changelog entry for pull request #1359
```
  2fd7ea97
- A
  
  ActiveSupport CHANGELOG entry moved to correct place · 1cd235ec
  由 Andrew Radev 提交于 5月 28, 2011
  
  1cd235ec
- A
  
  Update CHANGELOG for ActiveSupport::OrderedHash change · 07a353dd
  由 Andrew Radev 提交于 5月 28, 2011
  
  07a353dd
- J
  Merge pull request #1373 from anbotero/master · 429a1f2d
  由 José Valim 提交于 5月 28, 2011
```
Minor typo corrected
```
  429a1f2d
- A
  
  Fix typo in test. · 5a5736d7
  由 Andrés Botero 提交于 5月 28, 2011
  
  5a5736d7
- J
  Merge pull request #1372 from jacott/master · f07ff6b8
  由 José Valim 提交于 5月 27, 2011
```
Fix for relative_url_root when used with sprockets
```
  f07ff6b8
- J
  
  fixed asset_paths when called from sprockets for relative_url_root · db5adf2d
  由 jacott 提交于 5月 28, 2011
  
  db5adf2d
- X
  Merge pull request #1371 from FLOChip/typo · 6a3eabe9
  由 Xavier Noria 提交于 5月 27, 2011
```
Typo in ActionMailer::Base
```
  6a3eabe9
- T
  
  minor typo in the rdoc about Interceptor. · 9a67a117
  由 Teng Siong Ong 提交于 5月 28, 2011
  
  9a67a117
- T
  
  minor spacing fix in code example in ActionMailer::Base. · 0f0213f4
  由 Teng Siong Ong 提交于 5月 28, 2011
  
  0f0213f4
- A
  Merge pull request #1368 from amatsuda/disable_im_by_default_on_test · b7baf121
  由 Aaron Patterson 提交于 5月 27, 2011
```
Disable IdentityMap by default for ActiveRecord testing
```
  b7baf121
- 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 3 次提交
- 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