aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Make sure that we don't perform in-place mutation on SafeBuffer stringPrem Sichanugrist2011-06-101-0/+3
| | | | | | | | | | | | | | | | | | This will make sure `render :inline` is working. Closes #1633
* | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-111-3/+3
|\ \ \ | |/ / |/| |
| * | shallow_path example updatedganesh2011-06-101-3/+3
| | |
* | | Ensure number helpers can handle HTML safe strings - closes #1597.Andrew White2011-06-101-1/+1
| | |
* | | Merge pull request #1523 from raghunadhd/refactor_regexXavier Noria2011-06-101-4/+7
|\ \ \ | | | | | | | | rafactored the regex related code in the mapper class
| * | | removed the unnecessary back slashes from the regular expressionRaghunadh2011-06-101-2/+2
| | | |
| * | | rafactored the regex related code in the mapper class Raghunadh2011-06-071-4/+7
| | | |
* | | | Make sure `escape_javascript` return `SafeBuffer` if the incoming argument ↵Prem Sichanugrist2011-06-091-1/+2
| | | | | | | | | | | | | | | | is already html_safe
* | | | Indention style + whitespace for readabilityDavid Heinemeier Hansson2011-06-091-33/+38
| | | |
* | | | If you set a js_compressor, it means that you want shit compressed -- we ↵David Heinemeier Hansson2011-06-091-2/+2
| | | | | | | | | | | | | | | | dont need a second option to turn that on
* | | | Make escape_javascript happy to handle SafeBuffersPaul Gallagher2011-06-081-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/safebufferJosé Valim2011-06-072-5/+9
|\ \ \ | | | | | | | | Fix ActionPack tests on `master`
| * | | Add proper fix to `mail_to` helper.Prem Sichanugrist2011-06-081-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 Sichanugrist2011-06-081-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_safebufferJosé Valim2011-06-071-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 Meiklejohn2011-06-071-1/+2
| | |/ | |/|
* | | remove warning: assigned but unused variableSantiago Pastorino2011-06-087-9/+4
| | |
* | | Fragment caching needs to operate on the pure output, not theChristopher Meiklejohn2011-06-071-1/+3
|/ / | | | | | | safebuffer.
* / Update asset helpers to use `config.assets.prefix` Joshua Peek2011-06-071-2/+2
|/ | | Fixes #1489
* Added missing assert to test checking form with namespaced isolated model ↵Piotr Sarnacki2011-06-071-1/+1
| | | | and fixed helpers to work correctly in such case
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-069-14/+13
|\ | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS
| * Remove trailing white-spacesGuillermo Iguaran2011-06-055-6/+5
| |
| * some grammatical correctionsVijay Dev2011-06-041-3/+3
| |
| * Removing trailing white-spacesGuillermo Iguaran2011-05-311-2/+2
| |
| * The example in the API docs incorrectly indicated that form_for would use ↵Mark Roghelia2011-05-311-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 examplediego2011-05-261-1/+1
| |
* | Add backward compatibility for testing cookiesAndrew White2011-06-053-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 stringsAndrew White2011-06-051-2/+3
| |
* | Allow multiple sources in Sprockets helpersGuillermo Iguaran2011-06-051-28/+34
| |
* | Add missing require for cookies middlewareAndrew White2011-06-041-0/+1
| |
* | Refactor ActionController::TestCase cookiesAndrew White2011-06-044-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_routePiotr Sarnacki2011-06-011-1/+3
|\ \ | | | | | | Fix creating an empty route on 1.8. Closes #1210
| * | fix creating an empty route on 1.8. Closes #1210Damien Mathieu2011-06-011-1/+3
| | |
* | | Merge pull request #1448 from ernie/attr_internal_requireJosé Valim2011-06-011-0/+2
|\ \ \ | |/ / |/| | Require attr_internal before using in ActionView::Helpers
| * | Require attr_internal before using in ActionView::HelpersErnie Miller2011-06-011-0/+2
| | |
* | | Remove autoload for a couple of constants which don't exist anymorebrainopia2011-05-311-5/+0
| | |
* | | Corrected some typos and American vs. Queen's English issuesLee Reilly2011-05-291-4/+4
| | |
* | | Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-testsJosé Valim2011-05-281-0/+19
|\ \ \ | | | | | | | | Stringify param values in controller tests.
| * | | use to_param (and change method to name accordingly)David Chelimsky2011-05-221-8/+8
| | | | | | | | | | | | | | | | | | | | - exclude Rack::Test::UploadedFile to pass existing tests. Are there any other types we're missing?
| * | | Stringify param values in controller tests.David Chelimsky2011-05-221-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces false positives that come from using ints in params in tests, which do not get converted to strings in the tests. In implementations going through rack, they do get converted to strings. - David Chelimsky and Sam Umbach
* | | | fixed asset_paths when called from sprockets for relative_url_rootjacott2011-05-282-11/+7
| | | |
* | | | Merge pull request #1324 from dmathieu/no_error_on_invalid_formatJosé Valim2011-05-261-1/+1
|\ \ \ \ | | | | | | | | | | Don't raise an exception if the format isn't recognized
| * | | | don't raise an exception if the format isn't recognizeddmathieu2011-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | Fixed while traveling to heuruko
* | | | | Merge pull request #1311 from kuldarkrabbi/masterJosé Valim2011-05-251-1/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | action_view/template/handler.rb has been removed
| * | | | action_view/template/handler has been removedKuldar Krabbi2011-05-251-1/+0
| |/ / /
* | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-2523-62/+62
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
| * | | fix minor spelling mistakes in commentsDmytrii Nagirniak2011-05-231-3/+3
| | | |
| * | | Remove extra white spaces on ActionPack docs.Sebastian Martinez2011-05-2322-53/+53
| | | |
| * | | Fixed documentation for scope with path.Anuj Dutta2011-05-221-2/+2
| | | |
| * | | fixes code highlight in shallow_path exampleDiego Plentz2011-05-191-4/+4
| | | |