Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Revert "Simplify JavaScriptHelper#escape_javascript" | Santiago Pastorino | 2011-08-24 | 1 | -4/+6 | |
| | | | | | | | | | | | | This commit broke the build without any improvement. This reverts commit eb0b71478ad4c37fdc4ec77bf2cf7c6b65dd36c4. | |||||
* | | Bring in sprockets precompile task | Joshua Peek | 2011-08-24 | 1 | -3/+26 | |
| | | ||||||
* | | Merge pull request #2644 from guilleiguaran/allow-assets-debugging | Santiago Pastorino | 2011-08-24 | 2 | -3/+6 | |
|\ \ | | | | | | | Add config.allow_debugging option | |||||
| * | | Add config.allow_debugging option to determine if the debug_assets query ↵ | Guillermo Iguaran | 2011-08-24 | 2 | -3/+6 | |
| | | | | | | | | | | | | param can be passed by user | |||||
* | | | Merge pull request #2668 from guilleiguaran/debug-assets-media-type | Santiago Pastorino | 2011-08-24 | 2 | -2/+6 | |
|\ \ \ | |/ / |/| | | Debug assets shouldn't ignore media type for stylesheets. Closes #2625 | |||||
| * | | Debug assets shouldn't ignore media type for stylesheets. Closes #2625 | Guillermo Iguaran | 2011-08-23 | 2 | -2/+6 | |
| | | | ||||||
* | | | Merge pull request #2647 from dmathieu/no_rescue | Santiago Pastorino | 2011-08-24 | 2 | -7/+8 | |
|\ \ \ | | | | | | | | | remove useless rescue | |||||
| * | | | remove useless rescue | Damien Mathieu | 2011-08-24 | 2 | -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_javascript | Daniel Schierbeck | 2011-08-24 | 1 | -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 nil | David Majda | 2011-08-23 | 1 | -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 #2654 | Andrew White | 2011-08-23 | 1 | -0/+17 | |
| | | | ||||||
* | | | Ensure regexp and hash key are UTF-8 | Andrew White | 2011-08-23 | 2 | -4/+16 | |
| | | | ||||||
* | | | Don't modify params in place - fixes #2624 | Andrew White | 2011-08-23 | 2 | -5/+9 | |
|/ / | ||||||
* | | Merge pull request #2411 from ai/debug_assets_by_config | Santiago Pastorino | 2011-08-22 | 2 | -18/+12 | |
|\ \ | | | | | | | Debug assets by config | |||||
| * | | Allow to debug assets by config.assets.debug | Andrey A.I. Sitnik | 2011-08-22 | 2 | -18/+12 | |
| | | | ||||||
* | | | Fix Sprockets rewrite_asset_path | Guillermo Iguaran | 2011-08-22 | 1 | -1/+1 | |
| | | | ||||||
* | | | Refactor Sprockets::Helpers::RailsHelper#performing_caching? | Daniel Schierbeck | 2011-08-22 | 1 | -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_j | Aaron Patterson | 2011-08-21 | 2 | -2/+4 | |
|\ \ \ | |/ / |/| | | fix escape_javascript for unicode character \u2028. | |||||
| * | | fix escape_javascript for unicode character \u2028. | Teng Siong Ong | 2011-08-21 | 2 | -2/+4 | |
| | | | ||||||
* | | | Fix sprockets warnings | Joshua Peek | 2011-08-21 | 3 | -7/+20 | |
|/ / | | | | | | | Fixes #2598 | |||||
* | | Merge pull request #2610 from asmega/documentation | Xavier Noria | 2011-08-21 | 1 | -1/+1 | |
|\ \ | | | | | | | added link to url_for in documentation | |||||
| * | | Use typewriter styling on url_for in documentation | asmega | 2011-08-21 | 1 | -1/+1 | |
| | | | ||||||
* | | | Bump sprockets to 2.0.0.beta.14 | Guillermo Iguaran | 2011-08-20 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #2596 from dharmatech/patch-1 | Santiago Pastorino | 2011-08-20 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | ActionController::Redirecting : fix docs typo | |||||
| * | | | ActionController::Redirecting : fix docs typo | dharmatech | 2011-08-20 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #2597 from dharmatech/patch-2 | Santiago Pastorino | 2011-08-20 | 1 | -1/+1 | |
|\ \ \ \ | |_|/ / |/| | | | actionpack/lib/action_controller/base.rb: docs typo | |||||
| * | | | actionpack/lib/action_controller/base.rb: docs typo | dharmatech | 2011-08-20 | 1 | -1/+1 | |
| |/ / | ||||||
* / / | params wrapper docs correction | Vijay Dev | 2011-08-21 | 1 | -4/+3 | |
|/ / | ||||||
* | | Debug assets by default in development and test environments | Guillermo Iguaran | 2011-08-18 | 2 | -8/+24 | |
| | | ||||||
* | | minor details revised in a gsub | Xavier Noria | 2011-08-18 | 1 | -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 Patterson | 2011-08-16 | 3 | -3/+27 | |
| | | ||||||
* | | Tags with invalid names should also be stripped in order to prevent | Aaron Patterson | 2011-08-16 | 2 | -1/+8 | |
| | | | | | | | | XSS attacks. Thanks Sascha Depold for the report. | |||||
* | | Use lazy load hooks to set parameter wrapping configuration. This means that ↵ | Jon Leighton | 2011-08-16 | 2 | -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 railties | Jon Leighton | 2011-08-16 | 1 | -1/+3 | |
| | | ||||||
* | | Don't refer to ActionController::Base in the wrap_parameters initializer - ↵ | Jon Leighton | 2011-08-16 | 2 | -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 Pastorino | 2011-08-15 | 1 | -4/+4 | |
| | | | | | | | | RAILS_ENV was not provided | |||||
* | | Unused variable removed. | Arun Agrawal | 2011-08-15 | 1 | -4/+4 | |
| | | ||||||
* | | Ensure changing RAILS_GROUPS will load the proper dependencies. | José Valim | 2011-08-14 | 1 | -13/+16 | |
| | | ||||||
* | | Methods like status and location are interfering with redirect_to [Closes #2511] | Franck Verrot | 2011-08-14 | 2 | -3/+8 | |
| | | ||||||
* | | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2011-08-13 | 3 | -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 fix | Oge Nnadi | 2011-08-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | update abstract_controller callbacks to document meta-programmed filters | geemus | 2011-08-13 | 1 | -18/+102 | |
| | | | ||||||
| * | | Rubygems => RubyGems | Sukeerthi Adiga | 2011-08-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | rephrase "like to be" | Waynn Lue | 2011-08-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | ActionView::Helpers::TextHelper#simple_format should not change the text in ↵ | Casebook Developer | 2011-08-13 | 2 | -3/+3 | |
| | | | | | | | | | | | | place. Now it duplicates it. | |||||
| * | | fix stringify_keys destructive behavior for most FormTagHelper functions | Waynn Lue | 2011-08-13 | 2 | -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. ↵ | thoefer | 2011-08-13 | 3 | -0/+35 | |
| | | | | | | | | | | | | | | | | | | Closes #1872. Closes #2031. Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | | Rename new method to_path to to_partial_path to avoid conflicts with ↵ | José Valim | 2011-08-13 | 4 | -10/+10 | |
| | | | | | | | | | | | | File#to_path and similar. | |||||
| * | | Removing extra requires from the test. Already loaded in abstract_unit. | Arun Agrawal | 2011-08-13 | 1 | -1/+0 | |
| | | | ||||||
| * | | remove extra require for 'active_support/dependencies' as it is required in ↵ | Vishnu Atrai | 2011-08-13 | 1 | -1/+0 | |
| | | | | | | | | | | | | abstract_unit.rb |