提交 · f4ed56df43b1f88dca46b1a343ede55e649b327e · 张重言 / rails

26 5月, 2011 33 次提交
- M
  
  added assertion for non-standard primary_key on models used in the primary_key test · f4ed56df
  由 Marian Rudzynski 提交于 5月 26, 2011
  
  f4ed56df
- 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
- 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
- X
  
  Merge branch 'master' of github.com:rails/rails · b7921f50
  由 Xavier Noria 提交于 5月 25, 2011
  
  b7921f50
- X
  Merge branch 'master' of git://github.com/lifo/docrails · 00e1d083
  由 Xavier Noria 提交于 5月 25, 2011
```
Conflicts:
	actionmailer/lib/action_mailer/base.rb
	activesupport/lib/active_support/core_ext/kernel/requires.rb
```
  00e1d083
- A
  Merge pull request #1285 from joshk/remove_active_record_deprecations · 6b436c23
  由 Aaron Patterson 提交于 5月 25, 2011
```
removed deprecated methods, and related tests, from ActiveRecord
```
  6b436c23
- J
  Merge pull request #1305 from amatsuda/require_rdoc_task_fail2 · d25b7c2e
  由 José Valim 提交于 5月 25, 2011
```
Ensure RDoc::Task exists even if 'rdoc/task' was not required
```
  d25b7c2e
- J
  Merge pull request #1308 from vijaydev/fix-codestat-indent · 89d06eac
  由 José Valim 提交于 5月 25, 2011
```
Minor indentation fix in code_statistics
```
  89d06eac
- L
  
  Typo; changed 'Febuary' to 'February' · 03f41837
  由 Lee Reilly 提交于 5月 25, 2011
  
  03f41837
- L
  
  Typo; changed 'colour' to 'color' & 'analysed' to 'analyzed' · 1d637d2f
  由 Lee Reilly 提交于 5月 25, 2011
  
  1d637d2f
- L
  
  Typo; changed 'enviroment' to 'environment' · 29ff12b7
  由 Lee Reilly 提交于 5月 25, 2011
  
  29ff12b7
- V
  
  prefer validates :x in place of validates_x_of · 2c29c40a
  由 Vijay Dev 提交于 5月 26, 2011
  
  2c29c40a
- V
  
  fixed minor errors · ffaefe26
  由 Vijay Dev 提交于 5月 26, 2011
  
  ffaefe26
- W
  
  Renaming helper in the Rake task, but why is this needed in the first place? (paging JP) · e144b3e3
  由 wycats 提交于 5月 25, 2011
  
  e144b3e3
- V
  
  fix indentation · 548e5baf
  由 Vijay Dev 提交于 5月 25, 2011
  
  548e5baf
- V
  
  changes validates_format & numericality to newer syntax · 492f6067
  由 Vijay Dev 提交于 5月 25, 2011
  
  492f6067
- V
  
  changes validates_inclusion & exclusion to newer syntax · f69d5cdd
  由 Vijay Dev 提交于 5月 25, 2011
  
  f69d5cdd
- V
  
  changes validates_length_of to newer syntax · 34a05a70
  由 Vijay Dev 提交于 5月 25, 2011
  
  34a05a70
- V
  
  changes validates_confirmation_of to newer syntax · cc10dff1
  由 Vijay Dev 提交于 5月 25, 2011
  
  cc10dff1
- V
  
  changes validates_acceptance_of to newer syntax · 084750c2
  由 Vijay Dev 提交于 5月 25, 2011
  
  084750c2
- V
  
  changes validates_uniqueness_of to newer syntax · deffc9d0
  由 Vijay Dev 提交于 5月 25, 2011
  
  deffc9d0
- V
  
  changes validates_presence_of to newer syntax · 45989b81
  由 Vijay Dev 提交于 5月 25, 2011
  
  45989b81
- V
  
  fix incorrect textile syntax · 542cee3a
  由 Vijay Dev 提交于 5月 25, 2011
  
  542cee3a
- A
  
  Ensure RDoc::Task exists even if 'rdoc/task' was not required · 05adf524
  由 Akira Matsuda 提交于 5月 26, 2011
  
  05adf524
25 5月, 2011 7 次提交
- X
  Merge pull request #1301 from amatsuda/require_rdoc_task_fail · ee46bb73
  由 Xavier Noria 提交于 5月 25, 2011
```
require 'rake/rdoctask' if failed to require 'rdoc/task'
```
  ee46bb73
- A
  require 'rake/rdoctask' if failed to require 'rdoc/task' · 24b28a2a
  由 Akira Matsuda 提交于 5月 26, 2011
```
fixes a regression introduced by b921679d
require 'rdoc/task' fails if the system RDoc version is below 2.4.2 (e.g. CRuby 1.8.7)
```
  24b28a2a
- J
  Merge pull request #1299 from cesario/mit-license · f116a483
  由 José Valim 提交于 5月 25, 2011
```
Ensure MIT-LICENSE is included in all the gemspec's
```
  f116a483
- F
  
  Add the MIT-LICENSE to the Active Support gemspec · 4633772a
  由 Franck Verrot 提交于 5月 25, 2011
  
  4633772a
- F
  
  Add the MIT-LICENSE to the Active Resource gemspec · 85283f05
  由 Franck Verrot 提交于 5月 25, 2011
  
  85283f05
- F
  
  Add the MIT-LICENSE to the Active Record gemspec · 64d97735
  由 Franck Verrot 提交于 5月 25, 2011
  
  64d97735
- J
  Merge pull request #1298 from flippingbits/add_test_files_to_gemspec · 903f1f90
  由 José Valim 提交于 5月 25, 2011
```
Add test files to engine's gemspec
```
  903f1f90