Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2219 from kommen/fix_fragment_caching_squashed | Santiago Pastorino | 2011-10-13 | 2 | -0/+50 |
| | | | | Fix fragment caching (squashed commits) | ||||
* | Support symbol and string actions in AC#respond_to options | Alexey Vakhov | 2011-10-11 | 1 | -1/+1 |
| | |||||
* | allow shorthand routes with nested optional parameters | Diego Carrion | 2011-10-10 | 1 | -0/+11 |
| | |||||
* | JSON responder should return errors with :error root | Denis Odorcic | 2011-10-10 | 1 | -0/+26 |
| | |||||
* | Merge pull request #3262 from subdigital/master | José Valim | 2011-10-09 | 1 | -1/+21 |
|\ | | | | | Add optional host option to force_ssl | ||||
| * | accept optional :host parameter to force_ssl | Ben Scheirman | 2011-10-08 | 1 | -1/+21 |
| | | |||||
* | | Merge pull request #3196 from avakhov/patch-am-av-tests-2 | José Valim | 2011-10-09 | 1 | -0/+16 |
|\ \ | | | | | | | Improve tests method for ActionView::TestCase and ActionMailer::TestCase | ||||
| * | | normalize arg for ActionView::TestCase tests method | Alexey Vakhov | 2011-10-03 | 1 | -0/+16 |
| | | | |||||
* | | | Fixes an issue when creating a date select with too many options. | Liborio Cannici | 2011-10-08 | 1 | -0/+9 |
| |/ |/| | | | | | | | | | | | | | | | | | Inspired by dlt https://github.com/dlt/rails/commit/9e615634745dc81598e7b880d52411338d3a7a93 Closes #239. Conflicts: actionpack/CHANGELOG | ||||
* | | just check to see that the first item in the list is an array | Aaron Patterson | 2011-10-07 | 1 | -0/+9 |
| | | |||||
* | | stylesheet_link_tag('/stylesheets/application') and similar helpers doesn't ↵ | Santiago Pastorino | 2011-10-05 | 1 | -0/+5 |
| | | | | | | | | throw Sprockets::FileOutsidePaths exception anymore | ||||
* | | Do not require railtie as it messes up Rails.application setup. | José Valim | 2011-10-05 | 1 | -2/+1 |
| | | |||||
* | | Fix the lame config.action_controller.present? check scattered throughout ↵ | José Valim | 2011-10-05 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | | assets_path. Conflicts: actionpack/test/template/sprockets_helper_test.rb | ||||
* | | Ensure default_asset_host_protocol is respected, closes #2980. | José Valim | 2011-10-05 | 1 | -2/+4 |
| | | |||||
* | | :subdomain can now be specified with a value of false in url_for, allowing ↵ | Kamil Sobieraj | 2011-10-04 | 2 | -0/+15 |
|/ | | | | for subdomain(s) removal from the host during link generation. Closes #2025 | ||||
* | normalize arg for AC::TestCase tests class method | Alexey Vakhov | 2011-10-03 | 1 | -0/+16 |
| | |||||
* | TestCase should respect the view_assigns API instead of pulling variables on ↵ | José Valim | 2011-10-02 | 1 | -0/+20 |
| | | | | its own. | ||||
* | javascript_path and stylesheet_path should honor the asset pipelining | Santiago Pastorino | 2011-09-28 | 1 | -2/+18 |
| | |||||
* | Make button_to helper support "form" option which is the form attributes. | Wen-Tien Chang | 2011-09-29 | 1 | -0/+4 |
| | |||||
* | Correctly override image_path in sprockets rails_helper | Christos Zisopoulos | 2011-09-26 | 1 | -0/+8 |
| | |||||
* | Just assert_equal here | Santiago Pastorino | 2011-09-26 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3135 from christos/respect_assets_digest_value | Santiago Pastorino | 2011-09-26 | 1 | -0/+8 |
|\ | | | | | Give precedence to `config.digest = false` over the existence of manifest.yml asset digests | ||||
| * | Give precedence to `config.digest = false` over manifest.yml asset digests | Christos Zisopoulos | 2011-09-26 | 1 | -0/+8 |
| | | |||||
* | | image_tag should use /assets if asset pipelining is turned on. Closes #3126 | Santiago Pastorino | 2011-09-26 | 1 | -0/+4 |
|/ | |||||
* | fix deprecation warning in cookie_store_test | Vijay Dev | 2011-09-25 | 1 | -1/+1 |
| | | | | The options argument to MessageVerifier#initialize should be a hash. | ||||
* | Implement Mime::Type#respond_to? (consistently with #method_missing) | Evgeniy Dolzhenko | 2011-09-25 | 1 | -0/+2 |
| | |||||
* | Merge pull request #3124 from avakhov/patch-6-stylesheet-link | José Valim | 2011-09-25 | 1 | -0/+4 |
|\ | | | | | escape options for the stylesheet_link_tag method | ||||
| * | escape options for the stylesheet_link_tag method | Alexey Vakhov | 2011-09-25 | 1 | -0/+4 |
| | | |||||
* | | Add public API for register new js and css compressors for Sprockets | Guillermo Iguaran | 2011-09-24 | 1 | -0/+29 |
|/ | |||||
* | Revert "Make process reuse the env var passed as argument" | Santiago Pastorino | 2011-09-24 | 1 | -6/+5 |
| | | | | This reverts commit 0e4748cd415660eb91e63d50aa15cdd027c612dd. | ||||
* | 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 |
|/ |