Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow to generate Application routes inside Engine | Piotr Sarnacki | 2010-09-03 | 2 | -4/+4 |
| | | | | | | This requires knowledge about original SCRIPT_NAME and the parent router. It should be pass through the env as ORIGIAL_SCRIPT_NAME and action_dispatch.parent_routes | ||||
* | Use env['action_dispatch.routes'] to determine if we should generate prefix ↵ | Piotr Sarnacki | 2010-09-03 | 3 | -7/+48 |
| | | | | | | | | | | or not. This technique is here to allow using routes from Engine in Application and vice versa. When using Engine routes inside Application it should generate prefix based on mount point. When using Engine routes inside Engine it should use env['SCRIPT_NAME']. In any other case it should generate prefix as env should not be even available. | ||||
* | require 'active_support/dependencies' in action_dispatch/middleware/stack | Piotr Sarnacki | 2010-09-03 | 1 | -0/+1 |
| | |||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-09-03 | 1 | -1/+1 |
|\ | |||||
| * | fix typo(?) | Akira Matsuda | 2010-09-01 | 1 | -1/+1 |
| | | |||||
* | | Revert "Setup explicit requires for files with exceptions. Removed them from ↵ | José Valim | 2010-09-02 | 10 | -11/+15 |
| | | | | | | | | | | | | | | | | autoloading." Booting a new Rails application does not work after this commit [#5359 state:open] This reverts commit 38a421b34d0b414564e919f67d339fac067a56e6. | ||||
* | | Ensure routes are loaded only after the initialization process finishes, ↵ | José Valim | 2010-09-02 | 1 | -5/+0 |
| | | | | | | | | ensuring all configuration options were applied. | ||||
* | | Setup explicit requires for files with exceptions. Removed them from ↵ | Łukasz Strzałkowski | 2010-09-02 | 10 | -15/+11 |
| | | | | | | | | | | | | autoloading. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Cleaned up autoload definitions. | Łukasz Strzałkowski | 2010-09-02 | 1 | -15/+20 |
| | | | | | | | | | | | | Now it's more transparent, and readable Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Removing RJS hack | Thiago Pradi | 2010-09-02 | 2 | -6/+1 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Move implicit nested call before options handling so that nested constraints ↵ | Andrew White | 2010-09-01 | 1 | -9/+7 |
| | | | | | | | | | | | | work [#5513 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Added :format option for form_for helper and spec for this [#5226 ↵ | Alex Chrome | 2010-09-01 | 1 | -1/+9 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Remove unnecessary code from UrlHelper#link_to. | yury | 2010-09-01 | 1 | -7/+2 |
| | | | | | | | | | | | | convert_options_to_data_attributes always returns not nil stringified html_options [#5445 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Use join instead of looping and calling to_s [#5492 state:resolved] | Thiago Pradi | 2010-09-01 | 1 | -3/+1 |
|/ | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-09-01 | 1 | -2/+3 |
|\ | |||||
| * | Fix API docs for button_to options | Jaime Iniesta | 2010-08-31 | 1 | -2/+3 |
| | | |||||
* | | Speed up form_for by specializing extract_options! (at asakusa.rb) | wycats | 2010-08-31 | 1 | -6/+8 |
| | | |||||
* | | Speed up content_tag_for by simplifying needed logic | wycats | 2010-08-31 | 1 | -3/+3 |
|/ | |||||
* | resolves merge conflict | Xavier Noria | 2010-08-31 | 7 | -62/+263 |
|\ | |||||
| * | Expanded routing documentation with current best practices | Joost Baaij | 2010-08-29 | 5 | -21/+188 |
| | | |||||
| * | Rework the routing documentation. | Joost Baaij | 2010-08-28 | 1 | -22/+75 |
| | | | | | | | | | | Move the default route to the bottom, as this practise should be discouraged. Add documentation for resources, external redirects and Rack applications. | ||||
| * | The call-seq directive has no useful effect on our documentation and is not ↵ | Joost Baaij | 2010-08-28 | 1 | -19/+0 |
| | | | | | | | | | | | | | | | | | | | | | | used anywhere else. Worse still, its use breaks some rdoc, replacing method names with a curly brace. Having just one call-seq directive doesn't add anything since this is covered by regular rdoc. Having multiple might make sense, but these are already documented with examples. This partly re-reverts 60de0e56b7f57f0052d7e4f43bd2ef9e363c6a1a but does not touch the vendorized code in html-scanner. | ||||
* | | Remove NonConcattingString. | José Valim | 2010-08-29 | 2 | -4/+1 |
| | | |||||
* | | Remove deprecated support to <% form_for %> and several ↵ | José Valim | 2010-08-29 | 7 | -187/+12 |
| | | | | | | | | ActionController::Base methods. | ||||
* | | Ensure that inherited helper_methods are available after calling ↵ | Jesse Storimer | 2010-08-28 | 1 | -1/+11 |
| | | | | | | | | | | | | clear_helpers [#5348 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Micro optimization for build_named_route_call in PolymorphicRoutes: | yury | 2010-08-28 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | 1. use map instead of inject 2. use [].join("_") instead of '<<'. It is a little bit faster for ruby 1.9.2 and x2 faster for ruby 1.8.7. http://gist.github.com/548143 [#5450 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | password_field renders with nil value by default | Santiago Pastorino | 2010-08-28 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | This makes the use of passwords secure by default if you want to render the value of the password_field you have to do for instance f.password_field(:password, :value => @user.password) # => <input type=password id=user_password name=user[password] value=#{@user.password} /> | ||||
* | | type="password" for password_fields | Santiago Pastorino | 2010-08-28 | 1 | -4/+4 |
|/ | |||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-08-28 | 19 | -124/+119 |
|\ | |||||
| * | Use common terminology | Joost Baaij | 2010-08-27 | 1 | -3/+3 |
| | | |||||
| * | Revert "call-seq directive makes rdoc cry and replaces method names with a ↵ | Xavier Noria | 2010-08-27 | 2 | -9/+43 |
| | | | | | | | | | | | | | | | | curly brace; besides it doesn't add anything when you only list one call example since this is obviously documented already" Reason: Part of this commit touches vendorized stuff, the rest is fine, could you please repatch? This reverts commit 60de0e56b7f57f0052d7e4f43bd2ef9e363c6a1a. | ||||
| * | escape constants that should not be linked to | Joost Baaij | 2010-08-27 | 5 | -11/+11 |
| | | |||||
| * | mention the alert and notice accessors on the flash | Joost Baaij | 2010-08-27 | 1 | -0/+5 |
| | | |||||
| * | expand cookie examples with signed and permanent methods | Joost Baaij | 2010-08-27 | 1 | -2/+11 |
| | | |||||
| * | call-seq directive makes rdoc cry and replaces method names with a curly ↵ | Joost Baaij | 2010-08-27 | 2 | -43/+9 |
| | | | | | | | | brace; besides it doesn't add anything when you only list one call example since this is obviously documented already | ||||
| * | escape constant names | Joost Baaij | 2010-08-26 | 2 | -9/+9 |
| | | |||||
| * | Reflect how CSRF protection now works and refer to the Security Guide for ↵ | Joost Baaij | 2010-08-26 | 1 | -36/+18 |
| | | | | | | | | more information | ||||
| * | cleanup of ActionController::Metal inline documentation | Joost Baaij | 2010-08-26 | 5 | -51/+50 |
| | | |||||
| * | Escape 'caching' when used in a sentence; remove unnessesary quotes | Joost Baaij | 2010-08-26 | 3 | -12/+12 |
| | | |||||
| * | Prevent any warnings from being printed during RDoc generation | Joost Baaij | 2010-08-26 | 1 | -1/+1 |
| | | |||||
* | | Add missing require. | José Valim | 2010-08-27 | 1 | -1/+2 |
| | | |||||
* | | Make InstanceTagMethods#value_before_type_cast raise if the model don't ↵ | Santiago Pastorino | 2010-08-27 | 1 | -3/+8 |
| | | | | | | | | | | | | respond to attr_before_type_cast or attr method [#3374] [#5471 state:committed] | ||||
* | | Removing some unuseful begin/end and refactor prompt_option_tag a bit | Carlos Antonio da Silva | 2010-08-27 | 1 | -16/+11 |
| | | | | | | | | | | | | [#5469 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | Be sure to call helper :all just on direct children. (Tests by Jesse Storimer) | José Valim | 2010-08-26 | 2 | -1/+2 |
| | | |||||
* | | Doh, be sure to store the string modification. | José Valim | 2010-08-26 | 1 | -3/+2 |
| | | |||||
* | | Do not modify frozen strings in place. | José Valim | 2010-08-26 | 1 | -1/+1 |
| | | |||||
* | | Add clear_helpers as a way to clean up all helpers added to this controller, ↵ | José Valim | 2010-08-26 | 1 | -0/+7 |
| | | | | | | | | maintaing just the helper with the same name as the controller. | ||||
* | | Ensure templates like template.html are found but still uses the proper ↵ | José Valim | 2010-08-26 | 1 | -3/+4 |
|/ | | | | virtual path. | ||||
* | Fix capture_helper.rb api documentation, unescaped script tag was breaking ↵ | Jaime Iniesta | 2010-08-26 | 1 | -1/+1 |
| | | | | it on the content_for explanation | ||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-08-26 | 7 | -61/+227 |
|\ |