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

4733 Commits

Author SHA1 Message Date
Josh Kalderimis
dad71c6099 removed 'unless const_defined?' code smell 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-21 23:34:45 +02:00
Xavier Noria
207fa59675 Merge remote branch 'rails/master' 
Conflicts:
	actionpack/lib/abstract_controller/base.rb
 2010-06-20 23:13:19 +02:00
Rizwan Reza
c20cfe477a Take out documentation from DeprecatedMapper to discourage its usage. 2010-06-21 01:02:25 +04:30
Rizwan Reza
3ec7b1cba3 Use h1 for titles. 2010-06-21 01:00:42 +04:30
Rizwan Reza
ab7830d66c Final touches and fixes. 2010-06-21 00:56:31 +04:30
Rizwan Reza
96b927d9db Action View is now titled. 2010-06-21 00:50:26 +04:30
Rizwan Reza
1a0dc267f1 Action View is now titled. 2010-06-21 00:50:08 +04:30
José Valim
772c2b0b86 Use the new ActiveSupport::FileUpdateChecker instead of RoutesReloader. 2010-06-20 13:37:58 +02:00
Thibaud Guillaume-Gentil
5522578d16 Fixed date_select date_separator when discard_month and/or discard_day are true [#4856 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-20 12:33:02 +02:00
Jan De Poorter
96f5e59a26 Make sure a namespaced <%= render form %> still renders the _form partial [#4784 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-20 00:58:10 +02:00
Tarsoly András
bb6cd6d3ec Use Rack::Utils.bytesize when calculating content-length of exception pages. [#4727 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-20 00:52:35 +02:00
rohit
95a8f252c0 remove executable permission from files that don't need it. [#4802 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-20 00:50:48 +02:00
David Chelimsky
86002a0dfe Support render_template in view tests. Useful for specifying which 
partials are rendered under different conditions.

[#4903 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-20 00:26:42 +02:00
Andrew White
1f84061c5c Don't use module to work out shallow name prefix and path as it may not accurately reflect the actual namespace [#4899 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-20 00:15:48 +02:00
Andrew White
ed3f042e99 Make polymorphic_url and scaffolding work with uncountable resources [#3930 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-20 00:15:41 +02:00
Andrew White
65ce3d1297 Accept an object for :constraints option [#4904 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-20 00:15:30 +02:00
José Valim
72725d7b7f Merge branch 'master' of github.com:rails/rails 2010-06-20 00:12:54 +02:00
José Valim
312f433241 Clear DescendantsTracker on each request. 2010-06-19 17:51:44 +02:00
Wincent Colaiuta
728b9eccad option_groups_from_collection_for_select should return HTML-safe string [#4879 state:resolved] 
Signed-off-by: Xavier Noria <fxn@hashref.com>
 2010-06-19 17:22:49 +02:00
wycats
f368b21cb6 Remove a relic of #request being in RackDelegation 2010-06-19 08:19:15 -07:00
José Valim
033e0a041f ActiveRecord and ActionPack now use the new descendants implementation. 2010-06-19 17:15:21 +02:00
Andrew White
bf59717b43 Custom resource routes should be scoped 
[#3765]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-06-19 00:15:06 -07:00
David Genord II
a186431414 form_for without :html and with :remote should not error 
[#4902 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-06-18 13:59:28 -07:00
Josh Kalderimis
9d3eeb9053 fix for :shallow in router not generating helpers for create, update, and destroy actions when :only or :except are used 
[#4900 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-06-18 13:59:14 -07:00
Santiago Pastorino
84d387bc0f Make text_helpers methods which return valid html to return it as safe and sanitize the input always unless :sanitize => false is set 
[#4825 state:committed]

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2010-06-17 13:34:10 -05:00
Andrew White
6db9558416 Add shallow routing option to new router [#3765 status:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2010-06-17 09:52:55 -05:00
Wincent Colaiuta
a424808df9 truncate() should not try to produce HTML-safe output 
As discussed in Lighthouse ticket #4825 and ticket #4878, the truncate()
method cannot guarantee safe output for all possible inputs/offsets, so
it is best to leave the output unsafe so that it gets escaped when used
in a view.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2010-06-17 09:41:04 -05:00
Rizwan Reza
f09736bc0f Added title to some other files in actionpack/lib/action_view 2010-06-16 22:57:50 +04:30
Rizwan Reza
324de1993b Added titles and description. 2010-06-16 22:54:53 +04:30
Rizwan Reza
5a0bc2c7bc Adds title and description where needed. 2010-06-16 22:47:49 +04:30
Evgeniy Dolzhenko
ef404c771d Fix a bunch of minor spelling mistakes 2010-06-15 12:04:22 +04:00
Xavier Noria
f17159b029 edit pass: the names of Rails components have a space, ie, "Active Record", not "ActiveRecord" 2010-06-14 23:22:04 +02:00
Neeraj Singh
f587dec2c9 truncate safe method description changes 2010-06-14 09:12:10 -04:00
Rizwan Reza
bf7429041e Merge branch 'master' of git://github.com/rails/rails 2010-06-14 13:13:13 +04:30
Neeraj Singh
e574ca920d render(:inline) in a layout before yield replaces original content 
[#4777 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-13 13:56:08 +02:00
Santiago Pastorino
27f337d54f truncate documentation an examples added for :safe option 2010-06-13 06:11:23 -03:00
Xavier Noria
d433c504b5 removes spurious .rb in require 2010-06-12 22:10:59 +02:00
Xavier Noria
f2991fc9cc Merge remote branch 'docrails/master' 2010-06-12 00:30:48 +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
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
Evgeniy Dolzhenko
ccf9577aee Fix a bunch of minor spelling mistakes 2010-06-11 14:15:34 +04:00
Xavier Noria
6356066006 Merge remote branch 'rails/master' 2010-06-10 22:00:55 +02:00