Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | * is not allowed in windows file names. Closes #2574 #2847 | Santiago Pastorino | 2011-09-04 | 1 | -0/+0 | |
| | ||||||
* | Properly escape glob characters. | Aaron Patterson | 2011-08-16 | 1 | -0/+1 | |
| | ||||||
* | Added view template invalid name check, along with tests. No merges in commit. | huskins | 2011-07-13 | 1 | -0/+1 | |
| | ||||||
* | Add tests for alternate asset prefix/environment | Sam Pohlenz | 2011-07-01 | 1 | -0/+1 | |
| | ||||||
* | Make sure respond_with with :js tries to render a template in all cases | José Valim | 2011-06-30 | 1 | -0/+1 | |
| | ||||||
* | Allow multiple sources in Sprockets helpers | Guillermo Iguaran | 2011-06-05 | 2 | -0/+0 | |
| | ||||||
* | removed deprecated methods, and related tests, from ActionPack | Josh Kalderimis | 2011-05-24 | 1 | -3/+0 | |
| | ||||||
* | Add debug_asset support | Joshua Peek | 2011-05-22 | 2 | -0/+2 | |
| | ||||||
* | All assets, including images, audio, and video, now uses the asset pipeline ↵ | David Heinemeier Hansson | 2011-04-19 | 1 | -0/+0 | |
| | | | | when its on | |||||
* | content_for should work with provide. | José Valim | 2011-04-16 | 4 | -0/+13 | |
| | ||||||
* | removes the RJS template handler | Xavier Noria | 2011-04-13 | 7 | -12/+0 | |
| | ||||||
* | removes support for render :update | Xavier Noria | 2011-04-13 | 5 | -11/+0 | |
| | ||||||
* | Merge branch 'master' into sprockets | Joshua Peek | 2011-04-12 | 2 | -0/+2 | |
|\ | ||||||
| * | pass respond_with options to controller render when using a template for api ↵ | Josh Kalderimis | 2011-03-31 | 1 | -0/+1 | |
| | | | | | | | | | | | | navigation Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | only try to display an api template in responders if the request is a get or ↵ | Josh Kalderimis | 2011-03-31 | 1 | -0/+1 | |
| | | | | | | | | | | | | there are no errors Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 2 | -0/+2 | |
|\| | ||||||
| * | Add a failing test case for an implicit action with a before filter. | Manfred Stienstra | 2011-03-23 | 2 | -0/+2 | |
| | | | | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | |||||
* | | Seperate asset directories | Joshua Peek | 2011-03-29 | 6 | -0/+0 | |
| | | ||||||
* | | Tests for SprocketsHelper | Joshua Peek | 2011-03-29 | 6 | -0/+0 | |
|/ | ||||||
* | [action_view] added custom patterns to template resolver | Chris Kowalik | 2011-03-20 | 3 | -0/+3 | |
| | ||||||
* | Add a test for 'render :layout' | Anton Astashov | 2011-02-03 | 1 | -0/+4 | |
| | | | | | | | | | To make sure it will show block contents if it is placed after 'render :partial' [#5557 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | Recreate symlink in layouts for tests | Piotr Sarnacki | 2010-12-31 | 1 | -0/+1 | |
| | ||||||
* | ActionController::Base.helpers.sanitize ignores case in protocol | Timothy N. Tsvetkov | 2010-12-30 | 1 | -1/+0 | |
| | | | | | | [#6044 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | Make TranslationHelper#translate use the :rescue_format option in I18n 0.5.0 | Sven Fuchs | 2010-12-04 | 5 | -2/+3 | |
| | | | | | | Don't catch exceptions here. Instead only declare that we want exceptions to be rescued as :html, but also let users configure reactions to exceptions in I18n. Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | add the fixture file | Neeraj Singh | 2010-11-22 | 1 | -0/+1 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Tests added for rendering partial with layout, when the partial contains ↵ | Santiago Pastorino | 2010-11-13 | 3 | -0/+10 | |
| | | | | another render layout with block call added missing fixtures | |||||
* | Fix render partial with layout and no block | Carlos Antonio da Silva | 2010-11-11 | 1 | -0/+2 | |
| | | | | | | | | When using a render :partial with :layout call, without giving a block, if the given :partial had another render :partial call, the layout was not being rendered. This commit fixes this context by storing variables before rendering the partial, so they are not overrided in any successive call to render partials down the path. All ActionPack tests are ok. | |||||
* | Fix issue with rendering partials and then yielding inside a render layout call | Carlos Antonio da Silva | 2010-11-11 | 4 | -0/+6 | |
| | | | | | | | The given block was never being executed when another render :partial call existed before the yield call, due to the block being overriden. This commit also adds some more tests to render with :layout option. | |||||
* | Deprecate old template handler API. Remove old handlers. | José Valim | 2010-10-10 | 15 | -6/+6 | |
| | ||||||
* | fix rendering a partial with an array as its :object [#5746 state:resolved] | Michael Koziarski | 2010-10-08 | 1 | -0/+1 | |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> Conflicts: actionpack/lib/action_view/render/partials.rb | |||||
* | Test correct method behaviour. | Emilio Tagua | 2010-09-29 | 1 | -1/+1 | |
| | ||||||
* | Use redefine_method since baz is already defined. | Emilio Tagua | 2010-09-28 | 1 | -1/+1 | |
| | ||||||
* | Remove useless string line causing a warning. | Emilio Tagua | 2010-09-28 | 1 | -1/+0 | |
| | ||||||
* | Modified ActionDispatch::Static to allow passing multiple roots | Piotr Sarnacki | 2010-09-03 | 4 | -0/+4 | |
| | ||||||
* | Be sure to call helper :all just on direct children. (Tests by Jesse Storimer) | José Valim | 2010-08-26 | 2 | -0/+6 | |
| | ||||||
* | Add clear_helpers as a way to clean up all helpers added to this controller, ↵ | José Valim | 2010-08-26 | 1 | -0/+5 | |
| | | | | maintaing just the helper with the same name as the controller. | |||||
* | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 6 | -15/+15 | |
| | | | | 's/[ \t]*$//' -i {} \;) | |||||
* | layout_for works again with objects as specified in the documentation and ↵ | José Valim & Carlos Antonio da Silva | 2010-08-11 | 2 | -0/+2 | |
| | | | | Rails 2.3 [#5357 state:resolved] | |||||
* | Fixed that an ArgumentError is thrown when request.session_options[:id] is ↵ | Michael Lovitt | 2010-06-27 | 1 | -0/+10 | |
| | | | | | | | | read in the following scenario: when the cookie store is used, and the session contains a serialized object of an unloaded class, and no session data accesses have occurred yet. Pushed the stale_session_check responsibility out of the SessionHash and down into the session store, closer to where the deserialization actually occurs. Added some test coverage for this case and others related to deserialization of unloaded types. [#4938] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Make sure a namespaced <%= render form %> still renders the _form partial ↵ | Jan De Poorter | 2010-06-20 | 1 | -0/+1 | |
| | | | | | | [#4784 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | render(:inline) in a layout before yield replaces original content | Neeraj Singh | 2010-06-13 | 1 | -0/+2 | |
| | | | | | | [#4777 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | fix translation test in actionpack [#4701 state:commited] | Santiago Pastorino | 2010-05-29 | 1 | -1/+1 | |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | |||||
* | translate method doesn't support arrays anymore and is optimized to be used ↵ | Santiago Pastorino | 2010-05-24 | 3 | -2/+1 | |
| | | | | | | with strings or symbols Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Revert "translation method for arrays on TranslationHelper module returns an ↵ | Santiago Pastorino | 2010-05-24 | 2 | -2/+2 | |
| | | | | | | | | array where values for keys of the form (.|_)html keys are html_safe" This reverts commit 05c95b5c5815c0b3ae55fda7a897922b7f3ec2c7. Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | translation method for arrays on TranslationHelper module returns an array ↵ | Santiago Pastorino | 2010-05-24 | 2 | -2/+2 | |
| | | | | | | | | where values for keys of the form (.|_)html keys are html_safe [#4675] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Revert "Moved encoding work in progress to a feature branch." | wycats | 2010-05-17 | 4 | -5/+4 | |
| | | | | This reverts commit ade756fe42423033bae8e5aea8f58782f7a6c517. | |||||
* | Moved encoding work in progress to a feature branch. | Jeremy Kemper | 2010-05-16 | 4 | -4/+5 | |
| | | | | This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c. | |||||
* | Significantly improved internal encoding heuristics and support. | wycats | 2010-05-16 | 4 | -5/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Default Encoding.default_internal to UTF-8 * Eliminated the use of file-wide magic comments to coerce code evaluated inside the file * Read templates as BINARY, use default_external or template-wide magic comments inside the Template to set the initial encoding * This means that template handlers in Ruby 1.9 will receive Strings encoded in default_internal (UTF-8 by default) * Create a better Exception for encoding issues, and use it when the template source has bytes that are not compatible with the specified encoding * Allow template handlers to opt-into handling BINARY. If they do so, they need to do some of their own manual encoding work * Added a "Configuration Gotchas" section to the intro Rails Guide instructing users to use UTF-8 for everything * Use config.encoding= in Ruby 1.8, and raise if a value that is an invalid $KCODE value is used Also: * Fixed a few tests that were assert() rather than assert_equal() and were caught by Minitest requiring a String for the message * Fixed a test where an assert_select was misformed, also caught by Minitest being more restrictive * Fixed a test where a Rack response was returning a String rather than an Enumerable | |||||
* | Check blocks are not incorrectly detected when compiling erubis templates ↵ | Simon Jefford | 2010-05-16 | 1 | -0/+1 | |
| | | | | | | [#4575 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | partial counters with :as [#2804 state:resolved] | Jeff Kreeftmeijer | 2010-05-15 | 1 | -0/+1 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> |