Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | middlewares should use logger from env | lest | 2011-11-25 | 6 | -31/+34 |
| | |||||
* | configuration option to always write cookie | lest | 2011-11-23 | 3 | -4/+9 |
| | |||||
* | Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_test | Yehuda Katz | 2011-11-23 | 1 | -3/+3 |
|\ | | | | | Warnings removed. (ambiguous first argument) | ||||
| * | Warnings removed. (ambiguous first argument) | kennyj | 2011-11-24 | 1 | -3/+3 |
| | | |||||
* | | Rely on a public contract between railties instead of accessing railtie ↵ | José Valim | 2011-11-23 | 5 | -12/+11 |
| | | | | | | | | methods directly. | ||||
* | | Remove unreachable code, and add additional testcases. | kennyj | 2011-11-24 | 3 | -6/+25 |
|/ | |||||
* | Merge pull request #3724 from marcandre/media_default | Yehuda Katz | 2011-11-22 | 1 | -0/+3 |
|\ | | | | | stylesheet_tag default's media is "screen" | ||||
| * | Make explicit the default media when calling stylesheet_tag and change the ↵ | Marc-Andre Lafortune | 2011-11-22 | 1 | -0/+3 |
| | | | | | | | | default generators. | ||||
* | | Merge pull request #3718 from lest/fix-javascript-include-tag | José Valim | 2011-11-22 | 2 | -1/+4 |
|\ \ | | | | | | | javascript_include_tag should add '.js' to sources that contain '.' | ||||
| * | | javascript_include_tag should add '.js' to sources that contain '.' | lest | 2011-11-22 | 2 | -1/+4 |
| | | | |||||
* | | | deprecation warning, changelog entry | lest | 2011-11-22 | 2 | -1/+7 |
| | | | |||||
* | | | move show_detailed_exceptions? to Rescue module | lest | 2011-11-22 | 4 | -7/+14 |
| | | | |||||
* | | | refactor show exceptions tests | lest | 2011-11-22 | 2 | -42/+78 |
| | | | |||||
* | | | add ActionController::Metal#show_detailed_exceptions? | lest | 2011-11-22 | 3 | -28/+38 |
|/ / | |||||
* | | Revert "copy options keys to the right place so that undo will work correctly" | Aaron Patterson | 2011-11-19 | 1 | -4/+10 |
| | | | | | | | | This reverts commit 3178cc9a80262d3bf7754f3507ef60243b46634f. | ||||
* | | Merge pull request #3695 from tobiassvn/partial_path_error | Yehuda Katz | 2011-11-19 | 2 | -2/+14 |
|\ \ | | | | | | | Meaningful errors for unexpected partial arguments. Fixes #3573 | ||||
| * | | Meaningful errors for unexpected partial arguments. Fixes #3573 | Tobias Svensson | 2011-11-19 | 2 | -2/+14 |
| | | | |||||
* | | | Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685. | Jon Leighton | 2011-11-19 | 3 | -2/+21 |
| | | | |||||
* | | | Bump sprockets to 2.1.1 | Jon Leighton | 2011-11-19 | 1 | -1/+1 |
|/ / | |||||
* | | Warning removed for shadowing variable | Arun Agrawal | 2011-11-19 | 1 | -1/+1 |
| | | |||||
* | | Revert "make sure to require the right deprecation warning file" | Aaron Patterson | 2011-11-18 | 1 | -1/+0 |
| | | | | | | | | This reverts commit 9d725e3df502a07222f35576108eb2df2bd88259. | ||||
* | | Refactoring the redirect method for the router api. | Aaron Patterson | 2011-11-18 | 2 | -25/+24 |
| | | |||||
* | | moving redirection to objects | Aaron Patterson | 2011-11-18 | 1 | -45/+58 |
| | | |||||
* | | remove the :path feature to redirects, since it cannot work | Aaron Patterson | 2011-11-18 | 2 | -48/+7 |
| | | |||||
* | | make sure to require the right deprecation warning file | Aaron Patterson | 2011-11-18 | 1 | -0/+1 |
| | | |||||
* | | arity check has been pushed up, so no need for proc wrapping | Aaron Patterson | 2011-11-18 | 1 | -1/+1 |
| | | |||||
* | | require that all blocks have arity of 2 | Aaron Patterson | 2011-11-18 | 2 | -6/+11 |
| | | |||||
* | | copy options keys to the right place so that undo will work correctly | Aaron Patterson | 2011-11-18 | 1 | -10/+4 |
| | | |||||
* | | no need for type checking | Aaron Patterson | 2011-11-18 | 1 | -1/+1 |
| | | |||||
* | | cleaning up variable names to match method parameter names | Aaron Patterson | 2011-11-18 | 1 | -6/+8 |
| | | |||||
* | | stop doing is_a? checks on the resource type | Aaron Patterson | 2011-11-18 | 1 | -4/+4 |
| | | |||||
* | | move constants to methods since nothing else is using them | Aaron Patterson | 2011-11-18 | 1 | -6/+5 |
| | | |||||
* | | pushing hash validation up | Aaron Patterson | 2011-11-18 | 1 | -13/+14 |
| | | |||||
* | | breaking match down to smaller methods | Aaron Patterson | 2011-11-18 | 1 | -19/+22 |
| | | |||||
* | | some refactoring of the match method | Aaron Patterson | 2011-11-18 | 1 | -25/+17 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-18 | 1 | -1/+2 |
|\ \ | |||||
| * | | put back the removed eg | Vijay Dev | 2011-11-18 | 1 | -0/+1 |
| | | | |||||
| * | | Fix a number_with_delimiter :separator example | Edward Anderson | 2011-11-17 | 1 | -1/+1 |
| | | | |||||
* | | | _html translation should escape interpolated arguments | lest | 2011-11-17 | 3 | -4/+29 |
| | | | |||||
* | | | Revert "warn the user values are directly interpolated into _html ↵ | Xavier Noria | 2011-11-17 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 d57d8098fc269a26ea0051a9027a33af1a9a4b2b. | ||||
* | | | warn the user values are directly interpolated into _html translation strings | Xavier Noria | 2011-11-17 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #3654 from wildchild/label_i18n | José Valim | 2011-11-17 | 2 | -1/+55 |
|\ \ \ | | | | | | | | | Fix impractical I18n lookup in nested fields_for | ||||
| * | | | Fix impractical I18n lookup in nested fields_for | Alexander Uvarov | 2011-11-17 | 2 | -1/+55 |
| | | | | |||||
* | | | | It should be @calculated_ip not @calculate_ip | Arun Agrawal | 2011-11-17 | 1 | -1/+1 |
|/ / / | | | | | | | | | | We are using @calculated_ip. @calculate_ip is no where used | ||||
* | | | Initialize our instance variables. | Aaron Patterson | 2011-11-16 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #3649 from indirect/remote_ip | Aaron Patterson | 2011-11-16 | 2 | -5/+7 |
|\ \ \ | | | | | | | | | Fixes for Request#remote_ip (no middleware, all proxies) | ||||
| * | | | the object itself isn't the IP, #to_s is the IP | Andre Arko | 2011-11-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | :facepalm: Request#remote_ip has to work without the middleware | Andre Arko | 2011-11-16 | 2 | -3/+3 |
| | | | | |||||
| * | | | Revert "Revert "Merge pull request #3640 from indirect/remote_ip"" | Andre Arko | 2011-11-16 | 2 | -6/+8 |
| | | | | | | | | | | | | | | | | This reverts commit 8d1a2b3ecde5a8745b3eaab4763a71d80ca3441f, because I have fixed the issues this commit caused in the next commit. | ||||
* | | | | Merge pull request #3500 from olivierlacan/error-whitespace | Jon Leighton | 2011-11-16 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | CSS fix to prevent error output from being breaking out of body element. |