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,773 Commits 34 Branches 105 Tags
b514b4d6962f3bb04062a900b15d2db118fa20ab
Commit Graph

16773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santiago Pastorino
b514b4d696 removes spurious .rb in require 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-13 13:56:08 +02:00
José Valim
a12079df9f Tidy up generators based on latest change on AM. 2010-06-13 13:56:08 +02:00
wycats
3b4a13b7a9 CI changes per Chad's request 2010-06-13 00:06:35 -07:00
Santiago Pastorino
6d19a4a664 Change implementation to do it without asking each time for block_given? 
Signed-off-by: Xavier Noria <fxn@hashref.com>
 2010-06-13 07:27:26 +02:00
Xavier Noria
36143d26cb revises implementation of AS::OrderedHash#merge! 2010-06-13 06:37:54 +02:00
Xavier Noria
3359af63a5 Revert "hash merging with a block ignores non-existing keys altogether" 
This reverts commit 72f9fec607.

It is wrong, this feature is a little undocumented, doing some research.
 2010-06-13 05:53:42 +02:00
Xavier Noria
72f9fec607 hash merging with a block ignores non-existing keys altogether 2010-06-13 05:09:31 +02:00
Paul Barry
9183eaebed re-organized test for merge into separate tests 
Signed-off-by: Xavier Noria <fxn@hashref.com>
 2010-06-13 04:19:35 +02:00
Paul Mucur
58e21a4a0d Support passing a block to ActiveSupport::OrderedHash's merge and merge! [#4838 state:committed] 
For better consistency with Ruby's own Hash implementation.

Signed-off-by: Xavier Noria <fxn@hashref.com>
 2010-06-13 04:19:35 +02:00
wycats
a087bc85fd Revert "Revert "Validators should at model level and not at AR:Base level [Closes #4804]"" 
This reverts commit d675493065.
 2010-06-12 18:48:27 -07:00
Santiago Pastorino
6865b5e4eb Bump rack-mount version to 0.6.4 2010-06-12 18:47:37 -07:00
Santiago Pastorino
f802eb2f00 require conversions to use String#ord 2010-06-12 18:47:37 -07:00
wycats
d675493065 Revert "Validators should at model level and not at AR:Base level [Closes #4804]" 
This reverts commit e11bb95d56.
 2010-06-12 18:47:37 -07:00
Xavier Noria
f28d5cfbe6 registers 4146a44 in CHANGELOG 2010-06-12 22:16:57 +02:00
Xavier Noria
d433c504b5 removes spurious .rb in require 2010-06-12 22:10:59 +02:00
David Chelimsky
d588bbd431 Move ActionMailer::TC to AV::TC::Behavior 
[#4843 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-12 15:34:31 +02:00
rohit
7508c0e9d3 Change sanitize to escape in test names of text_helper_test [#4844 state:resolved] 2010-06-12 15:34:05 +02:00
José Valim
30eaecb3df subject is automatically looked up on I18n using mailer_name and action_name as scope as in t('.subject') 2010-06-12 15:33:12 +02:00
José Valim
b308a6030e Use load_paths on AR benchmarks so it uses the bundler setup instead of system gems. 2010-06-12 10:07:35 +02:00
José Valim
1eecd9483b No need to call convert_key before except. 2010-06-12 09:54:18 +02:00
José Valim
50ec0d9b2e Simplify and optimize callbacks superclass sync. 2010-06-12 09:54:18 +02:00
Lawrence Curtis
f0963e2ab0 Create mailers folder when starting a new rails app 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-12 09:54:18 +02:00
Damien Mathieu
b5ce2490c1 Test create mailers folder when starting a new app 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-12 09:54:18 +02:00
Pratik Naik
9a23a03505 Remove an unused method 2010-06-12 11:54:52 +05:30
Jeremy Kemper
be43ad69af Support ruby 1.8.7 and 1.9.2 (and development versions) 2010-06-11 16:40:04 -07:00
Xavier Noria
f2991fc9cc Merge remote branch 'docrails/master' 2010-06-12 00:30:48 +02:00
Xavier Noria
b731948bda AS guide: updates docs on date calculations to reflect a0a6cc2 2010-06-12 00:19:12 +02:00
Geoff Buesing
4146a443b6 Date#since, #ago, #beginning_of_day, #end_of_day, #xmlschema return TimeWithZone when Time.zone_default is set 
Signed-off-by: Xavier Noria <fxn@hashref.com>
 2010-06-12 00:19:12 +02:00
Jeremy Kemper
1a5654851e Single ruby version requirement message 2010-06-11 11:02:47 -07:00
Jeremy Kemper
acad3ba848 Ruby 1.9.1 compat: constant lookup 2010-06-11 11:00:56 -07:00
Jeremy Kemper
ed61c3b640 Remove String#constantize deps 2010-06-11 10:33:43 -07:00
Jeremy Kemper
cfc9439454 Explicitly delegate Chars#<=> to work around Kernel#<=> possibly ignoring method_missing 2010-06-11 10:03:23 -07:00
José Valim
85cc1fa657 Revert "Don't overwrite unsaved updates when loading an association but preserve the order of the loaded records. [#4642 state:open]" 
This commit introduced a regression described in ticket [#4830].

This reverts commit 0265c708b9.
 2010-06-11 17:05:54 +02:00
Santiago Pastorino
b4976ce91b text_helper now escape the unsafe input instead of sanitizing 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-11 16:34:53 +02:00
Rizwan Reza
51ad68367a Added tests for cookies with domain option. 2010-06-11 16:34:53 +02:00
Rizwan Reza
132730d5db Moved test/controller/cookie_test.rb to test/dispatch/cookies_test.rb 2010-06-11 16:34:53 +02:00
Rizwan Reza
b602ce6191 Refactored duplication into a separate method. Dropped class variable. 2010-06-11 16:34:53 +02:00
Rizwan Reza
6148b2dd73 Adding missing docs to delete cookies with :all which were added that way. 2010-06-11 16:34:53 +02:00
Rizwan Reza
f99132663b Took out the domain option logic to cookies.rb. 2010-06-11 16:34:52 +02:00
Rizwan Reza
5609149d84 Moved Domain regexp to a constant and added comments. 2010-06-11 16:34:52 +02:00
Rizwan Reza
edbb78d6cc The previous commit didn't work with complex domains, which is now fixed. 2010-06-11 16:34:52 +02:00
Rizwan Reza
44830ead1c Add support for multi-subdomain session by setting cookie host in session cookie so you can share session between www.example.com, example.com and user.example.com. [#4818 state:resolved] 
This reverts commit 330a89072a.
 2010-06-11 16:34:52 +02:00
Xavier Noria
4278e7f2b3 adds missing require for having ActiveSupport::InheritableOptions defined 2010-06-11 15:23:24 +02:00
Xavier Noria
b69a2db952 adds missing require for having ActiveSupport::InheritableOptions defined 2010-06-11 15:20:26 +02:00
Slobodan Kovacevic
5a745575be Updated all number helpers with :locale option. 2010-06-11 14:04:38 +02:00
Xavier Noria
2148e2cc94 grammar fixes 2010-06-11 07:00:08 +02:00
Neeraj Singh
54437f30f7 fixing typo 2010-06-10 21:49:09 -04:00
Pavel Gorbokon
835fd07b48 Fix spelling error in ActiveModel::Conversion docs. [#4826 state:resolved] 2010-06-11 03:09:27 +03:00
Xavier Noria
6356066006 Merge remote branch 'rails/master' 2010-06-10 22:00:55 +02:00
Xavier Noria
61fc7a4550 abort generation/booting on Ruby 1.9.1 2010-06-10 21:49:45 +02:00