mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
26,112 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

7764 Commits

Author SHA1 Message Date
kennyj ea70e027b6 Remove unreachable code, and add additional testcases. 2011-11-24 00:25:34 +09:00
Yehuda Katz 9b7be78820 Merge pull request #3724 from marcandre/media_default 
stylesheet_tag default's media is "screen"
 2011-11-22 12:38:05 -08:00
Marc-Andre Lafortune 05e02deb68 Make explicit the default media when calling stylesheet_tag and change the default generators. 2011-11-22 15:16:23 -05:00
José Valim b13b49ccc1 Merge pull request #3718 from lest/fix-javascript-include-tag 
javascript_include_tag should add '.js' to sources that contain '.'
 2011-11-22 09:45:11 -08:00
lest 3a1d51959b deprecation warning, changelog entry 2011-11-22 17:36:58 +03:00
lest aa491f6a9c javascript_include_tag should add '.js' to sources that contain '.' 2011-11-22 16:39:07 +03:00
lest 5bcd119b8d move show_detailed_exceptions? to Rescue module 2011-11-22 13:34:13 +03:00
lest c6d6b28bb4 refactor show exceptions tests 2011-11-22 11:38:55 +03:00
lest a9e8cf78fd add ActionController::Metal#show_detailed_exceptions? 2011-11-22 11:38:24 +03:00
Aaron Patterson 3d2bd69385 Revert "copy options keys to the right place so that undo will work correctly" 
This reverts commit 3178cc9a80.
 2011-11-19 20:35:54 -08:00
Yehuda Katz bc04455f10 Merge pull request #3695 from tobiassvn/partial_path_error 
Meaningful errors for unexpected partial arguments. Fixes #3573
 2011-11-19 07:38:22 -08:00
Jon Leighton 603a679e87 Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685. 2011-11-19 13:28:07 +00:00
Jon Leighton 86b5e81e8a Bump sprockets to 2.1.1 2011-11-19 13:08:34 +00:00
Tobias Svensson 771635e858 Meaningful errors for unexpected partial arguments. Fixes #3573 2011-11-19 13:05:57 +00:00
Arun Agrawal d806ea2050 Warning removed for shadowing variable 2011-11-19 11:29:29 +05:30
Aaron Patterson 396ef44be4 Revert "make sure to require the right deprecation warning file" 
This reverts commit 9d725e3df502a07222f35576108eb2df2bd88259.
 2011-11-18 10:51:12 -08:00
Aaron Patterson 99d94f126d Refactoring the redirect method for the router api. 2011-11-18 10:51:12 -08:00
Aaron Patterson d34efdd260 moving redirection to objects 2011-11-18 10:51:12 -08:00
Aaron Patterson 0809c675ef remove the :path feature to redirects, since it cannot work 2011-11-18 10:51:11 -08:00
Aaron Patterson a8a4264858 make sure to require the right deprecation warning file 2011-11-18 10:51:11 -08:00
Aaron Patterson 163b645472 arity check has been pushed up, so no need for proc wrapping 2011-11-18 10:51:11 -08:00
Aaron Patterson 4589b2419b require that all blocks have arity of 2 2011-11-18 10:51:11 -08:00
Aaron Patterson 3178cc9a80 copy options keys to the right place so that undo will work correctly 2011-11-18 10:51:11 -08:00
Aaron Patterson ecbae99478 no need for type checking 2011-11-18 10:51:11 -08:00
Aaron Patterson 636405d2a6 cleaning up variable names to match method parameter names 2011-11-18 10:51:10 -08:00
Aaron Patterson 33543ac871 stop doing is_a? checks on the resource type 2011-11-18 10:51:10 -08:00
Aaron Patterson 648f6113d1 move constants to methods since nothing else is using them 2011-11-18 10:51:10 -08:00
Aaron Patterson 7459ba4f6c pushing hash validation up 2011-11-18 10:51:10 -08:00
Aaron Patterson 494ab25772 breaking match down to smaller methods 2011-11-18 10:51:10 -08:00
Aaron Patterson 76780c34f5 some refactoring of the match method 2011-11-18 10:51:09 -08:00
Vijay Dev 48b580a03b Merge branch 'master' of github.com:lifo/docrails 2011-11-18 23:11:46 +05:30
Vijay Dev 5a2db4c7c3 put back the removed eg 2011-11-18 23:09:30 +05:30
Edward Anderson fe88745d5f Fix a number_with_delimiter :separator example 2011-11-17 20:10:49 -05:00
lest e8d57f361a _html translation should escape interpolated arguments 2011-11-17 23:07:39 +00:00
Xavier Noria 1079724fe6 Revert "warn the user values are directly interpolated into _html translation strings" 
Reason: After another round of discussion, it has been
decided to let interpolation deal with unsafe strings
as it should do.

This reverts commit d57d8098fc.
 2011-11-17 23:59:19 +01:00
Xavier Noria d57d8098fc warn the user values are directly interpolated into _html translation strings 2011-11-17 23:07:06 +01:00
José Valim e2d3060a68 Merge pull request #3654 from wildchild/label_i18n 
Fix impractical I18n lookup in nested fields_for
 2011-11-17 00:02:49 -08:00
Arun Agrawal c3ae1d2aec It should be @calculated_ip not @calculate_ip 
We are using @calculated_ip. 
@calculate_ip is no where used
 2011-11-17 12:50:19 +05:30
Alexander Uvarov c2b6f63bbe Fix impractical I18n lookup in nested fields_for 2011-11-17 12:37:00 +06:00
Aaron Patterson e367142255 Initialize our instance variables. 2011-11-16 16:55:11 -08:00
Aaron Patterson 70f9b74a49 Merge pull request #3649 from indirect/remote_ip 
Fixes for Request#remote_ip (no middleware, all proxies)
 2011-11-16 16:44:09 -08:00
Jon Leighton 272f2b778f Merge pull request #3500 from olivierlacan/error-whitespace 
CSS fix to prevent error output from being breaking out of body element.
 2011-11-16 15:26:31 -08:00
Andre Arko a9044d0117 the object itself isn't the IP, #to_s is the IP 2011-11-16 13:13:22 -10:00
Andre Arko 5621abd569 🤦 Request#remote_ip has to work without the middleware 2011-11-16 12:54:18 -10:00
Andre Arko f05ccf805a Revert "Revert "Merge pull request #3640 from indirect/remote_ip"" 
This reverts commit 8d1a2b3ecd, because I have fixed the issues this commit caused in the next commit.
 2011-11-16 12:53:43 -10:00
Jon Leighton 3a6a10a36d Switch from marshal format to plain text for the encoding conversions dump. This is for windows compatibility. Fixes #3644. 2011-11-16 21:38:06 +00:00
Jon Leighton 8d1a2b3ecd Revert "Merge pull request #3640 from indirect/remote_ip" 
This reverts commit 6491aadc52, reversing
changes made to 83bf0b626c.

See https://github.com/rails/rails/pull/3640#issuecomment-2752761 for
explanation.
 2011-11-15 22:47:18 +00:00
Andre Arko d743954792 GetIp#to_s should never return nil. That's icky. 2011-11-14 16:43:21 -10:00
Andre Arko b8c85de620 add test for bug fixed in 4f2bf64 2011-11-14 12:29:51 -10:00
Andre Arko 4f2bf6491c Return the calculated remote_ip or ip 
This was an especially nasty bug introduced in 317f4e2, by the way that an instance of GetIp is not nil, but GetIp#to_s could sometimes return nil. Gross, huh?
 2011-11-14 11:23:33 -10:00