提交 · 4c566940a42bbcff5c202460319b872a44c35140 · 张重言 / rails

26 5月, 2011 23 次提交
- S
  
  Fix grammar mistake. Lets vs let's. · 4c566940
  由 Sebastian Martinez 提交于 5月 25, 2011
  
  4c566940
- S
  
  Fix fixed-fonts stlye on rails_on_rack guide. · 0f7a52d9
  由 Sebastian Martinez 提交于 5月 25, 2011
  
  0f7a52d9
- 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 17 次提交
- 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
- S
  
  Improve test assertion · 22be5ca8
  由 Stefan Sprenger 提交于 5月 25, 2011
  
  22be5ca8
- S
  
  Remove whitespaces from empty line · 360b98f0
  由 Stefan Sprenger 提交于 5月 25, 2011
  
  360b98f0
- S
  
  Add test files to engine's gemspec · 5cf934ea
  由 Stefan Sprenger 提交于 5月 25, 2011
  
  5cf934ea
- J
  Merge pull request #1260 from flippingbits/master · 41eac9b3
  由 José Valim 提交于 5月 25, 2011
```
Remove shebang from the template
```
  41eac9b3
- J
  
  Replace old wording about http requests · 727a5a7c
  由 Jeff Cohen 提交于 5月 25, 2011
  
  727a5a7c
- J
  Merge pull request #1297 from cesario/1294-allocated-object-cant-be-inspected · b145a725
  由 José Valim 提交于 5月 25, 2011
```
#1294 : allocated object cant be inspected [closes #1294]
```
  b145a725
- F
  
  Fix the AR::Base#inspect method [closes #1294] · b2db8740
  由 Franck Verrot 提交于 5月 25, 2011
  
  b2db8740
- F
  
  Test AR::Base#inspect on an allocated object not yet initialized · bf159aa5
  由 Franck Verrot 提交于 5月 25, 2011
  
  bf159aa5
- J
  Merge pull request #1293 from janx/master · b1bb9d17
  由 José Valim 提交于 5月 25, 2011
```
Fix Rails::Paths::Root documentation
```
  b1bb9d17
- J
  Merge pull request #1292 from arunagw/database_generators · 9562c0f8
  由 José Valim 提交于 5月 25, 2011
```
Database.rake file fixed for load_generators
```
  9562c0f8