提交 · 0919c0dbca3df02f5cfff7dde4f61b85ef16d886 · 张重言 / rails

09 6月, 2010 29 次提交
- S
  Removed textilize, textilize_without_paragraph and markdown helpers · 0919c0db
  由 Santiago Pastorino 提交于 6月 09, 2010
```
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
```
  0919c0db
- N
  Better test for ticket [#3914 state:resolved] · f48aa14b
  由 Neeraj Singh 提交于 6月 08, 2010
```
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
```
  f48aa14b
- W
  
  Merge branch 'master' of github.com:rails/rails · df40dbe6
  由 wycats 提交于 6月 08, 2010
  
  df40dbe6
- W
  
  Update bundler dependency · 6ebc7c8e
  由 wycats 提交于 6月 08, 2010
  
  6ebc7c8e
- J
  
  Add more cases to previous commit [#4394 state:resolved] · 5c9f27ab
  由 José Valim 提交于 6月 08, 2010
  
  5c9f27ab
- J
  Make sure namespaces are nested within resources · 4560385f
  由 Jan De Poorter 提交于 4月 14, 2010
```
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
```
  4560385f
- N
  cache_sweeper yields blank output · db23a95a
  由 Neeraj Singh 提交于 5月 07, 2010
```
[#3914 state:open]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
```
  db23a95a
- B
  Make logic for after_commit and after_rollback :on option work like it does... · 2500e6af
  由 Brian Durand 提交于 6月 08, 2010
```
Make logic for after_commit and after_rollback :on option work like it does for validation callbacks.

[#2991 state:committed]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>
```
  2500e6af
- J
  Revert "Temporarily revert "Update after_commit and after_rollback docs and... · b0707392
  由 Jeremy Kemper 提交于 6月 08, 2010
```
Revert "Temporarily revert "Update after_commit and after_rollback docs and tests to use new style API with an :on options instead of on_* suffix." and "Add after_commit and after_rollback callbacks to ActiveRecord that are called after transactions either commit or rollback on all records saved or destroyed in the transaction.""

This reverts commit 1b2941cb.

[#2991]
```
  b0707392
- J
  
  Clarify Fixture#key_ and value_list · 87cc3d55
  由 Jeremy Kemper 提交于 6月 08, 2010
  
  87cc3d55
- X
  
  Merge remote branch 'docrails/master' · f1c0bcfb
  由 Xavier Noria 提交于 6月 08, 2010
  
  f1c0bcfb
- J
  
  Bring pg back. · e50bf67f
  由 José Valim 提交于 6月 08, 2010
  
  e50bf67f
- E
  Avoid PostgreSQL and MySQL tests warnings. · 4b4a548a
  由 Emilio Tagua 提交于 6月 08, 2010
```
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
```
  4b4a548a
- D
  Revert "Add shallow routes to the new router" for now. Needs more work. · 03be2709
  由 David Heinemeier Hansson 提交于 6月 08, 2010
```
This reverts commit 67a60ee3.
```
  03be2709
- A
  Fix ActiveRecord::Base.compute_type swallowing NoMethodError. [#4751 state:resolved] · 0e9b9d59
  由 Andrew Bloomgarden 提交于 6月 01, 2010
```
Signed-off-by: NDavid Heinemeier Hansson <david@loudthinking.com>
```
  0e9b9d59
- D
  Memoize the object returned by _view in ActionView::TestCase::Behavior · bdcf70cc
  由 David Chelimsky 提交于 6月 08, 2010
```
[#4799 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
```
  bdcf70cc
- X
  
  Merge remote branch 'rails/master' · 751f79a0
  由 Xavier Noria 提交于 6月 08, 2010
  
  751f79a0
- E
  Add parentheses to avoid warnings when running AR tests. · ab2877cb
  由 Emilio Tagua 提交于 6月 08, 2010
```
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
```
  ab2877cb
- E
  Bump Arel to 0.4.0 · d103c73d
  由 Emilio Tagua 提交于 6月 08, 2010
```
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
```
  d103c73d
- J
  Temporarily revert "Update after_commit and after_rollback docs and tests to... · 1b2941cb
  由 Jeremy Kemper 提交于 6月 08, 2010
```
Temporarily revert "Update after_commit and after_rollback docs and tests to use new style API with an :on options instead of on_* suffix." and "Add after_commit and after_rollback callbacks to ActiveRecord that are called after transactions either commit or rollback on all records saved or destroyed in the transaction."

This reverts commits d2a49e4b and da840d13.

[#2991]

Conflicts:

	activerecord/CHANGELOG
	activerecord/lib/active_record/transactions.rb
	activerecord/test/cases/transaction_callbacks_test.rb
```
  1b2941cb
- D
  
  Get ready for beta 4 · 32d4330b
  由 David Heinemeier Hansson 提交于 6月 08, 2010
  
  32d4330b
- D
  
  Fixed double output from cache in no caching mode · 585f8f27
  由 David Heinemeier Hansson 提交于 6月 07, 2010
  
  585f8f27
- A
  forcing encoding on 1.9 when dealing with "binary" columns [#4612 state:resolved] · eb69721c
  由 Aaron Patterson 提交于 6月 08, 2010
```
Signed-off-by: Nwycats <wycats@gmail.com>
```
  eb69721c
- W
  
  Missing require restored · 6b49a71a
  由 wycats 提交于 6月 08, 2010
  
  6b49a71a
- J
  
  Accept both regexps and strings for LOCALHOST. · 68b4720f
  由 José Valim 提交于 6月 08, 2010
  
  68b4720f
- X
  
  AS guide: documents datetime calculations · e7e6ee3e
  由 Xavier Noria 提交于 6月 08, 2010
  
  e7e6ee3e
- W
  
  Require encoding.rb · 068f8d6e
  由 wycats 提交于 6月 08, 2010
  
  068f8d6e
- P
  Make sure that rails recognized the full notation of IPv6 loopback address,... · c6ad6439
  由 Prem Sichanugrist 提交于 6月 06, 2010
```
Make sure that rails recognized the full notation of IPv6 loopback address, and recognize 127.0.0.0/8 in IPv4
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
```
  c6ad6439
- A
  Fix resources ignoring scope options · a7edddf6
  由 Andrew White 提交于 6月 08, 2010
```
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
```
  a7edddf6
08 6月, 2010 11 次提交
- R
  Made markdown honor :safe option and handle safe input. Also added tests for markdown. · 47bf19c8
  由 rohit 提交于 6月 08, 2010
```
[#4794 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
```
  47bf19c8
- J
  
  Fix generator test broken when rails new was added. · 9d33c2ab
  由 José Valim 提交于 6月 08, 2010
  
  9d33c2ab
- J
  
  Hide remaining generators hooks [#4790 state:resolved] · aa8b56f5
  由 José Valim 提交于 6月 08, 2010
  
  aa8b56f5
- A
  Add support for actions on a new resource to the new routing DSL [#4328 state:resolved] · 4740fbac
  由 Andrew White 提交于 4月 05, 2010
```
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
```
  4740fbac
- R
  Fixed textilize_without_paragraph and added tests for it. [#4792 state:resolved] · 67f411c5
  由 rohit 提交于 6月 08, 2010
```
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
```
  67f411c5
- E
  Fix multiple self-referencing eager loads failing to join multiple times · a4eaa1fd
  由 Ernie Miller 提交于 5月 22, 2010
```
[#4679 state:committed]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>
```
  a4eaa1fd
- M
  
  Merge branch 'master' of git://github.com/rails/rails · e404490f
  由 Mikel Lindsaar 提交于 6月 08, 2010
  
  e404490f
- W
  
  Move the undef into the 1.9 only branch · 8d576b51
  由 wycats 提交于 6月 07, 2010
  
  8d576b51
- M
  
  Updating ActionMailer basics guide to have inline attachments · 80a044ed
  由 Mikel Lindsaar 提交于 6月 07, 2010
  
  80a044ed
- M
  
  Updating readme for ActionMailer::Base · 3762362e
  由 Mikel Lindsaar 提交于 6月 07, 2010
  
  3762362e
- W
  
  Merge remote branch 'rsim/oracle_enhanced_rails3' · b97a3f33
  由 wycats 提交于 6月 07, 2010
  
  b97a3f33