github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
16,700 Commits 34 Branches 105 Tags
v3.0.0.beta4
Commit Graph

16700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wycats
df40dbe6f1 Merge branch 'master' of github.com:rails/rails v3.0.0.beta4 2010-06-08 18:10:27 -04:00
wycats
6ebc7c8ee6 Update bundler dependency 2010-06-08 18:10:18 -04:00
José Valim
5c9f27abaa Add more cases to previous commit [#4394 state:resolved] 2010-06-08 23:26:51 +02:00
Jan De Poorter
4560385fa4 Make sure namespaces are nested within resources 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-08 23:21:53 +02:00
Neeraj Singh
db23a95a61 cache_sweeper yields blank output 
[#3914 state:open]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-08 23:20:04 +02:00
Brian Durand
2500e6af66 Make logic for after_commit and after_rollback :on option work like it does for validation callbacks. 
[#2991 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-06-08 17:05:29 -04:00
Jeremy Kemper
b070739240 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 1b2941cba1.

[#2991]
 2010-06-08 17:05:29 -04:00
Jeremy Kemper
87cc3d5569 Clarify Fixture#key_ and value_list 2010-06-08 17:05:29 -04:00
Xavier Noria
f1c0bcfbb6 Merge remote branch 'docrails/master' 2010-06-08 22:39:30 +02:00
José Valim
e50bf67ffa Bring pg back. 2010-06-08 22:36:35 +02:00
Emilio Tagua
4b4a548a60 Avoid PostgreSQL and MySQL tests warnings. 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-08 22:36:19 +02:00
David Heinemeier Hansson
03be27092b Revert "Add shallow routes to the new router" for now. Needs more work. 
This reverts commit 67a60ee314.
 2010-06-08 16:20:46 -04:00
Andrew Bloomgarden
0e9b9d5985 Fix ActiveRecord::Base.compute_type swallowing NoMethodError. [#4751 state:resolved] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2010-06-08 15:34:47 -04:00
David Chelimsky
bdcf70cca8 Memoize the object returned by _view in ActionView::TestCase::Behavior 
[#4799 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-08 21:25:31 +02:00
Xavier Noria
751f79a033 Merge remote branch 'rails/master' 2010-06-08 21:23:29 +02:00
Emilio Tagua
ab2877cbe8 Add parentheses to avoid warnings when running AR tests. 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-08 21:16:19 +02:00
Emilio Tagua
d103c73d95 Bump Arel to 0.4.0 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-08 20:59:14 +02:00
Jeremy Kemper
1b2941cba1 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 d2a49e4b1f and da840d13da.

[#2991]

Conflicts:

	activerecord/CHANGELOG
	activerecord/lib/active_record/transactions.rb
	activerecord/test/cases/transaction_callbacks_test.rb
 2010-06-08 14:56:08 -04:00
David Heinemeier Hansson
32d4330b81 Get ready for beta 4 2010-06-08 14:47:02 -04:00
David Heinemeier Hansson
585f8f27b1 Fixed double output from cache in no caching mode 2010-06-08 14:47:02 -04:00
Aaron Patterson
eb69721c9b forcing encoding on 1.9 when dealing with "binary" columns [#4612 state:resolved] 
Signed-off-by: wycats <wycats@gmail.com>
 2010-06-08 14:33:28 -04:00
wycats
6b49a71ab7 Missing require restored 2010-06-08 14:24:35 -04:00
José Valim
68b4720fd1 Accept both regexps and strings for LOCALHOST. 2010-06-08 20:11:05 +02:00
Xavier Noria
e7e6ee3e7b AS guide: documents datetime calculations 2010-06-08 20:10:39 +02:00
wycats
068f8d6e85 Require encoding.rb 2010-06-08 14:09:34 -04:00
Prem Sichanugrist
c6ad64394b Make sure that rails recognized the full notation of IPv6 loopback address, and recognize 127.0.0.0/8 in IPv4 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-08 19:45:40 +02:00
Andrew White
a7edddf605 Fix resources ignoring scope options 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-08 19:33:27 +02:00
rohit
47bf19c848 Made markdown honor :safe option and handle safe input. Also added tests for markdown. 
[#4794 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-08 17:00:11 +02:00
José Valim
9d33c2ab6f Fix generator test broken when rails new was added. 2010-06-08 16:05:19 +02:00
José Valim
aa8b56f5d6 Hide remaining generators hooks [#4790 state:resolved] 2010-06-08 16:01:11 +02:00
Andrew White
4740fbac85 Add support for actions on a new resource to the new routing DSL [#4328 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-08 09:11:39 +02:00
rohit
67f411c57b Fixed textilize_without_paragraph and added tests for it. [#4792 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-08 09:11:34 +02:00
Ernie Miller
a4eaa1fd39 Fix multiple self-referencing eager loads failing to join multiple times 
[#4679 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-06-08 01:02:19 -04:00
Mikel Lindsaar
e404490f9b Merge branch 'master' of git://github.com/rails/rails 2010-06-08 00:10:11 -04:00
wycats
8d576b51a1 Move the undef into the 1.9 only branch 2010-06-07 23:32:20 -04:00
Mikel Lindsaar
80a044edb6 Updating ActionMailer basics guide to have inline attachments 2010-06-07 23:25:49 -04:00
Mikel Lindsaar
3762362eab Updating readme for ActionMailer::Base 2010-06-07 23:14:54 -04:00
wycats
b97a3f33a3 Merge remote branch 'rsim/oracle_enhanced_rails3' 2010-06-07 23:03:59 -04:00
wycats
0042f4166f If we undef <=>, it solves a problem involving comparison. Please figure out the root cause. 2010-06-07 22:31:42 -04:00
Mikel Lindsaar
311d99eef0 Adding inline attachment support to ActionMailer 2010-06-07 21:54:53 -04:00
Mikel Lindsaar
21cc1ed437 Updating image_tag to support cid:content_id "URLs" 2010-06-07 21:53:31 -04:00
Santiago Pastorino and José Ignacio Costa
100f8b2dfc update docs before_validation_on_create => before_validation(:on => :create) 2010-06-07 22:21:28 -03:00
Santiago Pastorino
94ed39d146 This test shouldn't rely on the order of the data returned by select 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-06-07 20:06:31 -04:00
Diego Carrion
67a60ee314 Add shallow routes to the new router [Closes #3765] 2010-06-07 18:09:20 -05:00
José Valim
a04060fb6f Really make include_root_in_json default to true [#3770 state:resolved] 2010-06-08 01:02:45 +02:00
Mikel Lindsaar
a16fd96131 Merge branch 'master' of git://github.com/rails/rails 2010-06-07 18:30:18 -04:00
wycats
d6953cbfd3 regular expressions are usually ASCII-encoded, so force_encoding the content of a Node to the encoding of the regular expression is wrong. 2010-06-07 18:06:08 -04:00
José Valim
a210aff210 Add delete to middleware stack proxy. 2010-06-07 23:17:23 +02:00
José Valim
981f81275b Fix case when rendering a partial inside RJS with inherited layout [#4786 state:resolved] 2010-06-07 22:22:54 +02:00
Mikel Lindsaar
50031bf932 Updating ActionMailer to Mail 2.2.2 (fixing two tests to suit) 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-07 21:36:56 +02:00