aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* ensuring that json_escape returns html safe strings when passed an html safe ...Aaron Patterson2011-06-091-0/+10
* Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is...Prem Sichanugrist2011-06-093-1/+6
* Merge pull request #1606 from neerajdotname/remove_users_controller_from_testJosé Valim2011-06-091-3/+0
|\
| * 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
|/
* 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 dont...David Heinemeier Hansson2011-06-091-2/+2
* 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 SafeBuffersPaul Gallagher2011-06-082-1/+8
* | Make test meaningfulNeeraj Singh2011-06-081-1/+1
|/
* Merge pull request #1549 from neerajdotname/rename_to_method_for_actionJosé Valim2011-06-081-2/+2
|\
| * test name should reflect the name of the methodNeeraj Singh2011-06-081-2/+2
* | Merge pull request #1548 from neerajdotname/remove_class_me5José Valim2011-06-081-6/+0
|\ \
| * | remove unused class from testNeeraj Singh2011-06-081-6/+0
| |/
* | Merge pull request #1547 from sikachu/safebufferJosé Valim2011-06-073-5/+10
|\ \ | |/ |/|
| * Fix failing test on uninitialized `Rails.config.assets.prefix`Prem Sichanugrist2011-06-081-0/+1
| * Add proper fix to `mail_to` helper.Prem Sichanugrist2011-06-081-2/+2
| * Adapt [823aa223efbac6ad4d31ea33402892267bb77cb4] to make sure we perform clon...Prem Sichanugrist2011-06-081-3/+7
* | 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.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
|/
* Update asset helpers to use `config.assets.prefix` Joshua Peek2011-06-071-2/+2
* Added missing assert to test checking form with namespaced isolated model and...Piotr Sarnacki2011-06-072-6/+6
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-069-14/+13
|\
| * 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 the...Mark Roghelia2011-05-311-2/+2
| * 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
* | Add backward compatibility for testing cookiesAndrew White2011-06-054-5/+65
* | Ensure cookie keys are stringsAndrew White2011-06-052-2/+12
* | Merge pull request #1426 from arunagw/sprockets_gem_updateJosé Valim2011-06-051-1/+1
|\ \
| * | sprockets gem update to beta9 Arun Agrawal2011-05-311-1/+1
* | | Allow multiple sources in Sprockets helpersGuillermo Iguaran2011-06-054-28/+40
* | | Add missing require for cookies middlewareAndrew White2011-06-041-0/+1
* | | Refactor ActionController::TestCase cookiesAndrew White2011-06-048-65/+60
* | | Merge pull request #1447 from dmathieu/empty_routePiotr Sarnacki2011-06-012-1/+9
|\ \ \
| * | | fix creating an empty route on 1.8. Closes #1210Damien Mathieu2011-06-012-1/+9
| |/ /
* | | Merge pull request #1448 from ernie/attr_internal_requireJosé Valim2011-06-011-0/+2
|\ \ \ | |/ / |/| |
| * | 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-292-6/+6
* | | Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-testsJosé Valim2011-05-282-0/+29
|\ \ \
| * | | use to_param (and change method to name accordingly)David Chelimsky2011-05-221-8/+8
| * | | Stringify param values in controller tests.David Chelimsky2011-05-222-0/+29
* | | | Fix typo in test.Andrés Botero2011-05-281-1/+1