Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Remove usage of memoizable from ActionPack. | José Valim | 2011-06-16 | 2 | -10/+9 | |
| | | ||||||
* | | Also change the default route comment | Wen-Tien Chang | 2011-06-16 | 1 | -1/+1 | |
| | | ||||||
* | | simplify to only one condition | Damien Mathieu | 2011-06-15 | 1 | -5/+1 | |
| | | | | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | |||||
* | | Make MissingTranslation exception handler respect :rescue_format | Andrew White | 2011-06-15 | 1 | -1/+5 | |
| | | ||||||
* | | Fix appending sprockets paths | Joshua Peek | 2011-06-14 | 1 | -1/+6 | |
| | | ||||||
* | | Removed warning while running test with ruby 1.9.2 | bagwanpankaj | 2011-06-14 | 1 | -1/+1 | |
| | | ||||||
* | | all requests are utf-8. Don't use the external encoding. | Damien Mathieu | 2011-06-14 | 1 | -3/+2 | |
| | | ||||||
* | | encode the uploaded file's name in the default external encoding - Closes #869 | Damien Mathieu | 2011-06-14 | 1 | -1/+12 | |
| | | ||||||
* | | Merge pull request #1552 from bogdan/select | Piotr Sarnacki | 2011-06-11 | 1 | -6/+37 | |
|\ \ | | | | | | | Fixing select[multiple] html specification problem. | |||||
| * | | Fixing select[multiple] html specification problem. | Bogdan Gusiev | 2011-06-08 | 1 | -6/+37 | |
| | | | | | | | | | | | | Generating hidden input with same name before each multiple select | |||||
* | | | No need for a configuration option here. | José Valim | 2011-06-11 | 1 | -10/+2 | |
| | | | ||||||
* | | | Remove utf8_enforcer_param config option | David Lee | 2011-06-11 | 1 | -7/+0 | |
| | | | ||||||
* | | | Make utf8_enforcer_tag an overrideable method | David Lee | 2011-06-11 | 1 | -3/+7 | |
| | | | ||||||
* | | | Make utf8 enforcer param customizeable | David Lee | 2011-06-11 | 3 | -4/+18 | |
| | | | ||||||
* | | | There are no snowmen here | David Lee | 2011-06-11 | 1 | -3/+3 | |
| | | | ||||||
* | | | Revert "Make sure that we don't perform in-place mutation on SafeBuffer string" | Santiago Pastorino and José Ignacio Costa | 2011-06-10 | 1 | -3/+0 | |
| | | | | | | | | | | | | This reverts commit 115e80dccc65c3ed9a9750649d9ca4ea2a7e64f1. | |||||
* | | | Merge pull request #1642 from sikachu/master-render-inline | Aaron Patterson | 2011-06-10 | 1 | -0/+3 | |
|\ \ \ | |_|/ |/| | | Render inline fix for master | |||||
| * | | Make sure that we don't perform in-place mutation on SafeBuffer string | Prem Sichanugrist | 2011-06-10 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | This will make sure `render :inline` is working. Closes #1633 | |||||
* | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-11 | 1 | -3/+3 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | shallow_path example updated | ganesh | 2011-06-10 | 1 | -3/+3 | |
| | | | ||||||
* | | | Ensure number helpers can handle HTML safe strings - closes #1597. | Andrew White | 2011-06-10 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #1523 from raghunadhd/refactor_regex | Xavier Noria | 2011-06-10 | 1 | -4/+7 | |
|\ \ \ | | | | | | | | | rafactored the regex related code in the mapper class | |||||
| * | | | removed the unnecessary back slashes from the regular expression | Raghunadh | 2011-06-10 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | rafactored the regex related code in the mapper class | Raghunadh | 2011-06-07 | 1 | -4/+7 | |
| | | | | ||||||
* | | | | Make sure `escape_javascript` return `SafeBuffer` if the incoming argument ↵ | Prem Sichanugrist | 2011-06-09 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | is already html_safe | |||||
* | | | | Indention style + whitespace for readability | David Heinemeier Hansson | 2011-06-09 | 1 | -33/+38 | |
| | | | | ||||||
* | | | | If you set a js_compressor, it means that you want shit compressed -- we ↵ | David Heinemeier Hansson | 2011-06-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | dont need a second option to turn that on | |||||
* | | | | Make escape_javascript happy to handle SafeBuffers | Paul Gallagher | 2011-06-08 | 1 | -1/+1 | |
| |_|/ |/| | | | | | | | | | | | * see GH#1553 * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block | |||||
* | | | Merge pull request #1547 from sikachu/safebuffer | José Valim | 2011-06-07 | 2 | -5/+9 | |
|\ \ \ | | | | | | | | | Fix ActionPack tests on `master` | |||||
| * | | | Add proper fix to `mail_to` helper. | Prem Sichanugrist | 2011-06-08 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer` * Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior. | |||||
| * | | | Adapt [823aa223efbac6ad4d31ea33402892267bb77cb4] to make sure we perform ↵ | Prem Sichanugrist | 2011-06-08 | 1 | -3/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | cloning before manipulation only on `OutputBuffer`. After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223efbac6ad4d31ea33402892267bb77cb4] does not play nice with the String, and result in the fragment got lost. | |||||
* | | | | Merge pull request #1542 from cmeiklejohn/dont_gsub_on_safebuffer | José Valim | 2011-06-07 | 1 | -1/+2 | |
|\ \ \ \ | |/ / / |/| | | | Don't operate on the safebuffer, operate on a string and convert. | |||||
| * | | | Don't operate on the safebuffer, operate on a string and convert. | Christopher Meiklejohn | 2011-06-07 | 1 | -1/+2 | |
| | |/ | |/| | ||||||
* | | | remove warning: assigned but unused variable | Santiago Pastorino | 2011-06-08 | 7 | -9/+4 | |
| | | | ||||||
* | | | Fragment caching needs to operate on the pure output, not the | Christopher Meiklejohn | 2011-06-07 | 1 | -1/+3 | |
|/ / | | | | | | | safebuffer. | |||||
* / | Update asset helpers to use `config.assets.prefix` | Joshua Peek | 2011-06-07 | 1 | -2/+2 | |
|/ | | | Fixes #1489 | |||||
* | Added missing assert to test checking form with namespaced isolated model ↵ | Piotr Sarnacki | 2011-06-07 | 1 | -1/+1 | |
| | | | | and fixed helpers to work correctly in such case | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-06 | 9 | -14/+13 | |
|\ | | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS | |||||
| * | Remove trailing white-spaces | Guillermo Iguaran | 2011-06-05 | 5 | -6/+5 | |
| | | ||||||
| * | some grammatical corrections | Vijay Dev | 2011-06-04 | 1 | -3/+3 | |
| | | ||||||
| * | Removing trailing white-spaces | Guillermo Iguaran | 2011-05-31 | 1 | -2/+2 | |
| | | ||||||
| * | The example in the API docs incorrectly indicated that form_for would use ↵ | Mark Roghelia | 2011-05-31 | 1 | -2/+2 | |
| | | | | | | | | the same default route for both new and previously persisted records. The default path given in the example would have generated a routing error for new records. form_for actually uses polymorphic_path to determine which route to use based on the state of the record. The example has been updated to reflect the method's actual behavior. | |||||
| * | Added missing quote in grouped_options_for_select example | diego | 2011-05-26 | 1 | -1/+1 | |
| | | ||||||
* | | Add backward compatibility for testing cookies | Andrew White | 2011-06-05 | 3 | -3/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit restores the ability to assign cookies for testing via @request.env['HTTP_COOKIE'] and @request.cookies, e.g: @request.env['HTTP_COOKIE'] = 'user_name=david' get :index assert_equal 'david', cookies[:user_name] and @request.cookies[:user_name] = 'david' get :index assert_equal 'david', cookies[:user_name] Assigning via cookies[] is the preferred method and will take precedence over the other two methods. This is so that cookies set in controller actions have precedence and are carried over between calls to get, post, etc. | |||||
* | | Ensure cookie keys are strings | Andrew White | 2011-06-05 | 1 | -2/+3 | |
| | | ||||||
* | | Allow multiple sources in Sprockets helpers | Guillermo Iguaran | 2011-06-05 | 1 | -28/+34 | |
| | | ||||||
* | | Add missing require for cookies middleware | Andrew White | 2011-06-04 | 1 | -0/+1 | |
| | | ||||||
* | | Refactor ActionController::TestCase cookies | Andrew White | 2011-06-04 | 4 | -39/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning cookies for test cases should now use cookies[], e.g: cookies[:email] = 'user@example.com' get :index assert_equal 'user@example.com', cookies[:email] To clear the cookies, use clear, e.g: cookies.clear get :index assert_nil cookies[:email] We now no longer write out HTTP_COOKIE and the cookie jar is persistent between requests so if you need to manipulate the environment for your test you need to do it before the cookie jar is created. | |||||
* | | Merge pull request #1447 from dmathieu/empty_route | Piotr Sarnacki | 2011-06-01 | 1 | -1/+3 | |
|\ \ | | | | | | | Fix creating an empty route on 1.8. Closes #1210 | |||||
| * | | fix creating an empty route on 1.8. Closes #1210 | Damien Mathieu | 2011-06-01 | 1 | -1/+3 | |
| | | |