| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fix issue #11605 | Kassio Borges | 2013-08-24 | 6 | -5/+0 |
| | | |||||
| * | Fix typo in view name | Carlos Antonio da Silva | 2013-04-03 | 1 | -0/+0 |
| | | | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428 | ||||
| * | Use 1.8 hash style in test views | Carlos Antonio da Silva | 2013-04-03 | 2 | -2/+2 |
| | | | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428 | ||||
| * | Common behavior with adding formats to lookup_context for TemplateRenderer ↵ | Dmitry Vorotilin | 2013-04-02 | 7 | -0/+7 |
| | | | | | and PartialRenderer | ||||
| * | Backport #5808 | Mack Earnhardt | 2013-03-24 | 1 | -0/+2 |
| | | | | | | | df36c5f - Fix assert_template assertion with :layout option 4bd05a7 - Fix assert_template :layout => nil assertion 0d19a08 - Improve assert_template layout checking | ||||
| * | Fixes issue where duplicate assets can be required with sprockets. | jejacks0n | 2013-01-10 | 2 | -0/+2 |
| | | | | | | - addresses the problem by calling flatten on asset array before calling uniq. - adds note to CHANGELOG. | ||||
| * | Revert "Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased" | Rafael Mendonça França | 2012-10-31 | 1 | -1/+0 |
| | | | | | | | | | | | | | | This reverts commit 7d17cd2cbfc086f5aa9dd636e1207eb130150428. Conflicts: actionpack/CHANGELOG.md Reason: This added a regression since people were relying on this buggy behavior. This will introduce back #3849 but we will be backward compatible in stable release. Fixes #8068. | ||||
| * | Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased | Rafael Mendonça França | 2012-09-30 | 1 | -0/+1 |
| | | | | | | | | REBASED: fixing assert_template bug when template matches expected, but not ends with Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_controller/test_case.rb | ||||
| * | Merge pull request #6752 from steveklabnik/fix_5680 | Rafael Mendonça França | 2012-06-16 | 1 | -0/+3 |
| | | | | | Respect absolute paths in compute_source_path. | ||||
| * | Fix asset tags for files with more than one dot | Piotr Sarnacki | 2012-06-07 | 2 | -0/+0 |
| | | | | | | | | | | | | | | | | After the fix done in 39f9f02a, there are cases that will not work correctly. If you have file with "2 extensions", like foo.min.js and you reference the file without extension, like: javascript_include_tag "foo.min" it will fail because sprockets finds foo.min.js with foo.min argument. This commit fixes this case and will get the right file even when referrencing it without extension. (closes #6598) | ||||
| * | Assets: don't add extension if other given and file exists | Sergey Nartimov | 2012-05-21 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | We should lookup if asset without appended extension exists. When sprockets are disabled the asset tag helpers incorporate this logic. When sprockets are enabled we should have the same logic. For example, we have style.ext file in app/assets/stylesheets and we use stylesheet_link_tag in the layout. In this case we should have /assets/style.ext instead of /assets/style.ext.css in the output. Closes #6310 | ||||
| * | If partial is rendered in controller, grab format from template | Piotr Sarnacki | 2012-03-27 | 1 | -0/+1 |
| | | | | | | | | | | Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header. | ||||
| * | Add missing test for #5308 | Piotr Sarnacki | 2012-03-17 | 2 | -0/+2 |
| | | |||||
| * | Fix #5440 - multiple render_to_string breaks partials formats | Piotr Sarnacki | 2012-03-17 | 4 | -0/+4 |
| | | | | | | | | | | This fixes situation where rendering template to string sets `rendered_format` to the format rendered there. This is ok to have consistent formats rendered in partials, but it breaks on next renders if format is explicitly set or on last render where default format does not necessarily need to be the format of first rendered template. | ||||
| * | format lookup for partials is derived from the format in which the template ↵ | Santiago Pastorino | 2012-02-22 | 1 | -0/+1 |
| | | | | | | | is being rendered Closes #5025 part 2 | ||||
| * | Use the right format when a partial is missing. | Santiago Pastorino | 2012-02-20 | 1 | -0/+1 |
| | | | | | Closes #5025 | ||||
| * | Remove fixture files with Windows incompatible filenames | Andrew White | 2012-02-20 | 12 | -12/+0 |
| | | | | | | | Windows doesn't allow `\ / : * ? " < > |` in filenames so create the fixture files at runtime and ignore the incompatible ones when running on Windows. | ||||
| * | Fix ActionDispatch::Static to serve files with unencoded PCHAR | Andrew White | 2012-02-17 | 12 | -0/+12 |
| | | | | | | | | | | | | RFC 3986[1] allows sub-delim characters in path segments unencoded, however Rack::File requires them to be encoded so we use URI's unescape method to leave them alone and then escape them again. Also since the path gets passed to Dir[] we need to escape any glob characters in the path. [1]: http://www.ietf.org/rfc/rfc3986.txt | ||||
| * | Add font_path helper method | Santiago Pastorino | 2012-01-03 | 2 | -0/+0 |
| | | |||||
| * | test helpers in erb using erb | lest | 2011-11-30 | 1 | -0/+3 |
| | | |||||
| * | Deprecate set_sequence_name in favour of self.sequence_name= | Jon Leighton | 2011-11-29 | 1 | -2/+2 |
| | | |||||
| * | Deprecate set_table_name in favour of self.table_name= or defining your own ↵ | Jon Leighton | 2011-11-29 | 1 | -1/+1 |
| | | | | | method. | ||||
| * | fix label with block in erb | lest | 2011-11-27 | 1 | -0/+4 |
| | | |||||
| * | Merge pull request #2219 from kommen/fix_fragment_caching_squashed | Santiago Pastorino | 2011-10-13 | 1 | -0/+1 |
| | | | | | Fix fragment caching (squashed commits) | ||||
| * | added tests for render :file/:template and the :formats/:handlers/:locale ↵ | Nick Sutterer | 2011-09-23 | 2 | -0/+2 |
| | | | | | options. | ||||
| * | Deprecate passing the template handler in the template name. | José Valim | 2011-09-22 | 1 | -1/+1 |
| | | | | | | | For example, calling hello.erb is now deprecated. Since Rails 3.0 passing the handler had no effect whatsover. This commit simply deprecates such cases so we can clean up the code in later releases. | ||||
| * | it is now possible to pass details options (:formats, :details, :locales, ↵ | Nick Sutterer | 2011-09-22 | 2 | -0/+2 |
| | | | | | ...) to #render, #find_template and friends. this doesn't change anything in global context. | ||||
| * | * 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> | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |