aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Preserve stylesheet_link_tag and javascript_include_tag options on debugGuillermo Iguaran2011-08-241-4/+3
|
* Use super in javascript_include_tag and stylesheet_link_tag instead of ↵Guillermo Iguaran2011-08-241-14/+2
| | | | generate tags manually
* Remove redundant join and call to html_safeGuillermo Iguaran2011-08-241-2/+2
|
* Revert "Simplify JavaScriptHelper#escape_javascript"Santiago Pastorino2011-08-241-4/+6
| | | | | | This commit broke the build without any improvement. This reverts commit eb0b71478ad4c37fdc4ec77bf2cf7c6b65dd36c4.
* Bring in sprockets precompile taskJoshua Peek2011-08-241-3/+26
|
* Merge pull request #2644 from guilleiguaran/allow-assets-debuggingSantiago Pastorino2011-08-242-3/+6
|\ | | | | Add config.allow_debugging option
| * Add config.allow_debugging option to determine if the debug_assets query ↵Guillermo Iguaran2011-08-242-3/+6
| | | | | | | | param can be passed by user
* | Merge pull request #2668 from guilleiguaran/debug-assets-media-typeSantiago Pastorino2011-08-242-2/+6
|\ \ | |/ |/| Debug assets shouldn't ignore media type for stylesheets. Closes #2625
| * Debug assets shouldn't ignore media type for stylesheets. Closes #2625Guillermo Iguaran2011-08-232-2/+6
| |
* | Merge pull request #2647 from dmathieu/no_rescueSantiago Pastorino2011-08-242-7/+8
|\ \ | | | | | | remove useless rescue
| * | remove useless rescueDamien Mathieu2011-08-242-7/+8
| | | | | | | | | | | | | | | params is a method, defined in every controller, which always returns a hash. If it raises a NoMethodError, it means there's a bug somewhere else, which we want to know about.
* | | Simplify JavaScriptHelper#escape_javascriptDaniel Schierbeck2011-08-241-7/+6
| |/ |/| | | | | | | | | Use the Linus-style conditional. Also fix the documentation slightly. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
* | Make ActionController::TestCase#recycle! set @protocol to nilDavid Majda2011-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | This ensures that the protocol does not get carried over when there are two or more requests in functional tests. This was a problem when e.g. the first request was HTTP and the second request was HTTPS. Closes #2654. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
* | Add failing test case for #2654Andrew White2011-08-231-0/+17
| |
* | Ensure regexp and hash key are UTF-8Andrew White2011-08-232-4/+16
| |
* | Don't modify params in place - fixes #2624Andrew White2011-08-232-5/+9
|/
* Merge pull request #2411 from ai/debug_assets_by_configSantiago Pastorino2011-08-222-18/+12
|\ | | | | Debug assets by config
| * Allow to debug assets by config.assets.debugAndrey A.I. Sitnik2011-08-222-18/+12
| |
* | Fix Sprockets rewrite_asset_pathGuillermo Iguaran2011-08-221-1/+1
| |
* | Refactor Sprockets::Helpers::RailsHelper#performing_caching?Daniel Schierbeck2011-08-221-2/+7
| | | | | | | | | | No need for them lines to get so long! Also, move that comment into the method body where it belongs!
* | Merge pull request #2618 from FLOChip/unicode_jAaron Patterson2011-08-212-2/+4
|\ \ | |/ |/| fix escape_javascript for unicode character \u2028.
| * fix escape_javascript for unicode character \u2028.Teng Siong Ong2011-08-212-2/+4
| |
* | Fix sprockets warningsJoshua Peek2011-08-213-7/+20
|/ | | | Fixes #2598
* Merge pull request #2610 from asmega/documentationXavier Noria2011-08-211-1/+1
|\ | | | | added link to url_for in documentation
| * Use typewriter styling on url_for in documentationasmega2011-08-211-1/+1
| |
* | Bump sprockets to 2.0.0.beta.14Guillermo Iguaran2011-08-201-1/+1
| |
* | Merge pull request #2596 from dharmatech/patch-1Santiago Pastorino2011-08-201-1/+1
|\ \ | | | | | | ActionController::Redirecting : fix docs typo
| * | ActionController::Redirecting : fix docs typodharmatech2011-08-201-1/+1
| | |
* | | Merge pull request #2597 from dharmatech/patch-2Santiago Pastorino2011-08-201-1/+1
|\ \ \ | |_|/ |/| | actionpack/lib/action_controller/base.rb: docs typo
| * | actionpack/lib/action_controller/base.rb: docs typodharmatech2011-08-201-1/+1
| |/
* / params wrapper docs correctionVijay Dev2011-08-211-4/+3
|/
* Debug assets by default in development and test environmentsGuillermo Iguaran2011-08-182-8/+24
|
* minor details revised in a gsubXavier Noria2011-08-181-1/+1
| | | | | | | | | Regexps have a construct to express alternation of characters, which is character classes. In addition to being the most specific idiom to write this pattern, it reads better without the backslashes. Also, it is better not to use a capture if none is needed. As a side-effect of these changes, the gsub is marginally faster, but speed is not the point of this commit.
* Properly escape glob characters.Aaron Patterson2011-08-163-3/+27
|
* Tags with invalid names should also be stripped in order to preventAaron Patterson2011-08-162-1/+8
| | | | XSS attacks. Thanks Sascha Depold for the report.
* Use lazy load hooks to set parameter wrapping configuration. This means that ↵Jon Leighton2011-08-162-9/+0
| | | | it doesn't force Action Controller / Active Record to load, but it doesn't fail if they have already loaded. Thanks @josevalim for the hint.
* Fix assets tests in railtiesJon Leighton2011-08-161-1/+3
|
* Don't refer to ActionController::Base in the wrap_parameters initializer - ↵Jon Leighton2011-08-162-0/+9
| | | | use config object instead. Cuts about 15% off the load time. (#734)
* rake assets:precompile executes in production environment as default if ↵Santiago Pastorino2011-08-151-4/+4
| | | | RAILS_ENV was not provided
* Unused variable removed.Arun Agrawal2011-08-151-4/+4
|
* Ensure changing RAILS_GROUPS will load the proper dependencies.José Valim2011-08-141-13/+16
|
* Methods like status and location are interfering with redirect_to [Closes #2511]Franck Verrot2011-08-142-3/+8
|
* Merge branch 'master' of github.com:lifo/docrailsXavier Noria2011-08-133-21/+105
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: RELEASING_RAILS.rdoc actionpack/lib/sprockets/railtie.rb actionpack/test/template/sprockets_helper_test.rb activerecord/test/cases/calculations_test.rb railties/guides/source/3_1_release_notes.textile railties/guides/source/active_resource_basics.textile railties/guides/source/command_line.textile
| * Typo fixOge Nnadi2011-08-131-1/+1
| |
| * update abstract_controller callbacks to document meta-programmed filtersgeemus2011-08-131-18/+102
| |
| * Rubygems => RubyGemsSukeerthi Adiga2011-08-131-1/+1
| |
| * rephrase "like to be"Waynn Lue2011-08-131-1/+1
| |
| * ActionView::Helpers::TextHelper#simple_format should not change the text in ↵Casebook Developer2011-08-132-3/+3
| | | | | | | | place. Now it duplicates it.
| * fix stringify_keys destructive behavior for most FormTagHelper functionsWaynn Lue2011-08-132-4/+28
| | | | | | | | add four new tests to verify that the other three methods that called stringify_keys! are fixed. verified that the tests break in master without the code patch. Closes #2355
| * Fix the issue where default_url_options is being cached on test cases. ↵thoefer2011-08-133-0/+35
| | | | | | | | | | | | Closes #1872. Closes #2031. Signed-off-by: José Valim <jose.valim@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 04:04:31 +0000