aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Make utf8 enforcer param customizeableDavid Lee2011-06-113-4/+18
|
* There are no snowmen hereDavid Lee2011-06-113-7/+7
|
* Revert "Make sure that we don't perform in-place mutation on SafeBuffer string"Santiago Pastorino and José Ignacio Costa2011-06-102-8/+0
| | | | This reverts commit 115e80dccc65c3ed9a9750649d9ca4ea2a7e64f1.
* Merge pull request #1644 from smartinez87/warnsSantiago Pastorino2011-06-101-1/+1
|\ | | | | Remove unused variable causing warning in 1.9.3
| * Remove unused variable causing warning in 1.9.3Sebastian Martinez2011-06-101-1/+1
| |
* | Merge pull request #1642 from sikachu/master-render-inlineAaron Patterson2011-06-103-21/+31
|\ \ | | | | | | Render inline fix for master
| * | Make sure that we don't perform in-place mutation on SafeBuffer stringPrem Sichanugrist2011-06-102-0/+8
| | | | | | | | | | | | | | | | | | This will make sure `render :inline` is working. Closes #1633
| * | Update CHANGELOG to mention the json_escape change, and rearrange stuff a bit.Prem Sichanugrist2011-06-101-21/+23
| | |
* | | 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-102-1/+8
| | |
* | | 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
| | | |
* | | | add missing ensureNeeraj Singh2011-06-101-0/+1
| | | |
* | | | replaced and with && as per coding guidelinesNeeraj Singh2011-06-101-1/+1
| | | |
* | | | The test name is misleading. It saysNeeraj Singh2011-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_should_cache_with_trailing_slash_on_url A trailing slash is removed when a page is cached. What the test meant to say was : a url with trailing slash should be cached and the cached page should not have any trailing slash. This patch clarifies the name a bit.
* | | | ensuring that json_escape returns html safe strings when passed an html safe ↵Aaron Patterson2011-06-091-0/+10
| | | | | | | | | | | | | | | | string
* | | | Make sure `escape_javascript` return `SafeBuffer` if the incoming argument ↵Prem Sichanugrist2011-06-093-1/+6
| | | | | | | | | | | | | | | | is already html_safe
* | | | Merge pull request #1606 from neerajdotname/remove_users_controller_from_testJosé Valim2011-06-091-3/+0
|\ \ \ \ | | | | | | | | | | remove unused UserController from test
| * | | | remove unused user_controller from testNeeraj Singh2011-06-081-3/+0
| | |_|/ | |/| |
* / | | class WithSymbolReturningString is not used anywhere in the test.Neeraj Singh2011-06-081-12/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Secondly it seemed from the method that the intent was to test a case where layout was declared in a symbol and the method named mention in layout returns nil. That case is already covered with class class WithSymbolReturningNil . Also the case of SymbolReturningString is covered with the class WithSymbol.
* | | 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
* | | Update CHANGELOG to mention the new SafeBuffer changePrem Sichanugrist2011-06-081-0/+29
| | |
* | | Merge pull request #1560 from sikachu/master-escapejsJosé Valim2011-06-082-1/+8
|\ \ \ | | | | | | | | Make escape_javascript happy to handle SafeBuffers
| * | | Make escape_javascript happy to handle SafeBuffersPaul Gallagher2011-06-082-1/+8
| | | | | | | | | | | | | | | | | | | | * see GH#1553 * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block
* | | | Make test meaningfulNeeraj Singh2011-06-081-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | If before_filter list was being called mistakenly then the test should fail. However test will not fail because second filter is assigning new values to @list. To truly test that first before_filter is not called when it should not be called then @list should not assigned value unconditionally. This patch will make the test fail if first filter is called.
* | | Merge pull request #1549 from neerajdotname/rename_to_method_for_actionJosé Valim2011-06-081-2/+2
|\ \ \ | | | | | | | | test name should reflect the name of the method
| * | | test name should reflect the name of the methodNeeraj Singh2011-06-081-2/+2
| | | | | | | | | | | | | | | | that is actually being called
* | | | Merge pull request #1548 from neerajdotname/remove_class_me5José Valim2011-06-081-6/+0
|\ \ \ \ | | | | | | | | | | remove unused class from test
| * | | | remove unused class from testNeeraj Singh2011-06-081-6/+0
| |/ / /
* | | | Merge pull request #1547 from sikachu/safebufferJosé Valim2011-06-073-5/+10
|\ \ \ \ | |/ / / |/| | | Fix ActionPack tests on `master`
| * | | Fix failing test on uninitialized `Rails.config.assets.prefix`Prem Sichanugrist2011-06-081-0/+1
| | | | | | | | | | | | | | | | This was introduced in [2684f17a17e4f97bdb89d20b4cd08585235263a2] :bomb:
| * | | 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-0813-19/+10
| | |
* | | 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-072-6/+6
| | | | 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
| |
* | Use Latest Sprockets betaDavid Heinemeier Hansson2011-06-061-1/+1
| |
* | Move CHANGELOG entry to future versionAndrew White2011-06-051-1/+4
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 21:33:04 +0000