Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3092 from asee/master | Santiago Pastorino | 2011-09-23 | 1 | -0/+10 |
|\ | | | | | Sprockets to use config.assets.prefix, with tests | ||||
| * | Fixes #1489 again, with updated code and numerous tests to confirm | docunext | 2011-09-22 | 1 | -0/+10 |
| | | |||||
* | | Fix failing tests and add tests for :formats on partial. | José Valim | 2011-09-23 | 1 | -5/+10 |
| | | |||||
* | | Allow both sym and array for details options in #render. using ↵ | Nick Sutterer | 2011-09-23 | 1 | -0/+3 |
| | | | | | | | | LC#registered_details to extract options. | ||||
* | | added tests for render :file/:template and the :formats/:handlers/:locale ↵ | Nick Sutterer | 2011-09-23 | 3 | -1/+19 |
| | | | | | | | | options. | ||||
* | | Deprecate passing the template handler in the template name. | José Valim | 2011-09-22 | 10 | -65/+63 |
| | | | | | | | | | | | | 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. | ||||
* | | Get rid of update_details in favor of passing details to find_template. | José Valim | 2011-09-22 | 5 | -19/+16 |
| | | |||||
* | | it is now possible to pass details options (:formats, :details, :locales, ↵ | Nick Sutterer | 2011-09-22 | 3 | -0/+8 |
| | | | | | | | | ...) to #render, #find_template and friends. this doesn't change anything in global context. | ||||
* | | Fix named routes modifying arguments | Pawel Pierzchala | 2011-09-22 | 1 | -0/+11 |
|/ | |||||
* | Allow asset tag helper methods to accept :digest => false option in order to ↵ | Santiago Pastorino | 2011-09-14 | 1 | -16/+28 |
| | | | | completely avoid the digest generation. | ||||
* | Merge pull request #2964 from msgehard/silence_warnings | Santiago Pastorino | 2011-09-14 | 1 | -9/+2 |
|\ | | | | | Silence Ruby warnings about uninitialized instance variable. | ||||
| * | Silence Ruby warnings about uninitialized instance variable. | Mike Gehard | 2011-09-09 | 1 | -9/+2 |
| | | |||||
* | | Merge pull request #2977 from guilleiguaran/fix-relative-root-in-assets | Santiago Pastorino | 2011-09-12 | 1 | -0/+7 |
|\ \ | | | | | | | Set relative url root in assets when controller isn't available for Sprockets | ||||
| * | | Set relative url root in assets when controller isn't available for ↵ | Guillermo Iguaran | 2011-09-13 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | Sprockets. Fix #2435 See https://github.com/rails/sass-rails/issues/42 for details | ||||
* | | | all routes can be stored in the Journey Routes object | Aaron Patterson | 2011-09-12 | 2 | -1/+2 |
|/ / | |||||
* | | Merge pull request #2974 from md5/csrf_token_warning | Santiago Pastorino | 2011-09-10 | 1 | -1/+1 |
|\ \ | | | | | | | Use ensure instead of rescue | ||||
| * | | Use ensure instead of rescue | Mike Dillon | 2011-09-10 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2972 from md5/master | Aaron Patterson | 2011-09-10 | 1 | -0/+16 |
|\| | | | | | | | | Use log.warn instead of debug for CSRF token warning | ||||
| * | | Add test for warning and CHANGELOG entry | Mike Dillon | 2011-09-10 | 1 | -0/+16 |
| |/ | |||||
* / | No need to use </form> here. It's already in whole_form block | Arun Agrawal | 2011-09-10 | 1 | -2/+1 |
|/ | |||||
* | Pull up a method we only use once. | Aaron Patterson | 2011-09-08 | 1 | -5/+1 |
| | |||||
* | Conditions must never be equal | Aaron Patterson | 2011-09-08 | 1 | -6/+1 |
| | |||||
* | Merge pull request #2499 from akaspick/assert_select_email_fix | Jon Leighton | 2011-09-07 | 1 | -0/+19 |
|\ | | | | | Fix assert_select_email to work on non-multipart emails as well as converting the Mail::Body to a string to prevent errors. | ||||
| * | fix assert_select_email to work on non-multipart emails as well as ↵ | Andrew Kaspick | 2011-08-11 | 1 | -0/+19 |
| | | | | | | | | converting the Mail::Body to a string to prevent errors. | ||||
* | | Eliminate newlines in basic auth. fixes #2882 | Aaron Patterson | 2011-09-06 | 1 | -0/+8 |
| | | |||||
* | | Merge pull request #2872 from sikachu/content_tag_html_safe | Santiago Pastorino | 2011-09-05 | 1 | -0/+12 |
|\ \ | | | | | | | Make sure that result from content_tag_for with collection is html_safe | ||||
| * | | Make sure that result from content_tag_for with collection is html_safe | Prem Sichanugrist | 2011-09-05 | 1 | -0/+12 |
| | | | | | | | | | Thank you @spastorino for catching the empty test in b84cee0, as I totally forgot that I still have to make it html_safe. | ||||
* | | | Merge pull request #2815 from avakhov/current-page-non-get-requests | Santiago Pastorino | 2011-09-05 | 1 | -2/+8 |
|\ \ \ | | | | | | | | | current_page? returns false for non-GET requests | ||||
| * | | | current_page? returns false for non-GET requests | Alexey Vakhov | 2011-09-02 | 1 | -2/+8 |
| | | | | |||||
* | | | | Merge pull request #2799 from tomstuart/3-1-stable | Santiago Pastorino | 2011-09-05 | 1 | -0/+36 |
| | | | | | | | | | | | | | | | | Never return stored content from content_for when a block is given | ||||
* | | | | add blanks between methods | Vijay Dev | 2011-09-05 | 1 | -0/+3 |
| |/ / |/| | | |||||
* | | | Remove empty test | Santiago Pastorino | 2011-09-05 | 1 | -3/+0 |
| | | | |||||
* | | | Merge pull request #2863 from ↵ | Santiago Pastorino | 2011-09-04 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | raybaxter/silence_unitialized_instance_variable_warnings Silence unitialized instance variable warnings | ||||
| * | | | Tests shouldn't produce warnings | Ray Baxter | 2011-09-04 | 1 | -0/+5 |
| | | | | |||||
* | | | | * is not allowed in windows file names. Closes #2574 #2847 | Santiago Pastorino | 2011-09-04 | 2 | -1/+1 |
|/ / / | |||||
* / / | Make `content_tag_for` and `div_for` accepts the array of records | Prem Sichanugrist | 2011-09-04 | 1 | -2/+22 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So instead of having to do this: @items.each do |item| content_tag_for(:li, item) do Title: <%= item.title %> end end You can now do this: content_tag_for(:li, @items) do |item| Title: <%= item.title %> end | ||||
* | | CookieJar is enumerable. fixes #2795 | Aaron Patterson | 2011-09-01 | 1 | -0/+16 |
| | | |||||
* | | Backport f443f9cb0c64 to master | Guillermo Iguaran | 2011-08-31 | 1 | -2/+4 |
| | | |||||
* | | Revert "Merge pull request #2647 from dmathieu/no_rescue" | Santiago Pastorino | 2011-08-30 | 1 | -5/+1 |
| | | | | | | | | This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea. | ||||
* | | Removed Unused Variable. | Arun Agrawal | 2011-08-26 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2491 from waynn/fix_symbol | Santiago Pastorino | 2011-08-25 | 1 | -0/+6 |
|\ \ | | | | | | | fix destructive stringify_keys for label_tag | ||||
| * | | fix destructive stringify_keys for label_tag | Waynn Lue | 2011-08-11 | 1 | -0/+6 |
| | | | |||||
* | | | Merge pull request #2644 from guilleiguaran/allow-assets-debugging | Santiago Pastorino | 2011-08-24 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Add config.allow_debugging option | ||||
| * | | | Add config.allow_debugging option to determine if the debug_assets query ↵ | Guillermo Iguaran | 2011-08-24 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | param can be passed by user | ||||
* | | | | Merge pull request #2668 from guilleiguaran/debug-assets-media-type | Santiago Pastorino | 2011-08-24 | 1 | -0/+3 |
|\ \ \ \ | |/ / / |/| | | | 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 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #2647 from dmathieu/no_rescue | Santiago Pastorino | 2011-08-24 | 1 | -1/+5 |
|\ \ \ \ | |/ / / |/| | | | remove useless rescue | ||||
| * | | | remove useless rescue | Damien Mathieu | 2011-08-24 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | 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 | 1 | -1/+6 |
| | | | |