| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Autoload ActionDispatch::Request::Session to avoid circular require. | Andrew White | 2012-05-13 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Merge pull request #6293 from carlosantoniodasilva/render-partial-refactor | José Valim | 2012-05-13 | 2 | -38/+37 | |
| |\ \ \ | | | | | | | | | Improve and cleanup a bit partial renderer | |||||
| | * | | | Improve and cleanup a bit partial renderer | Carlos Antonio da Silva | 2012-05-12 | 2 | -38/+37 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove template assignment: there is no need for this assignment, given we are rendering a collection with possibly different templates, and a second call to render (with the same instance) would behave differently if the template is set. * Remove segments array in favor of Array#map * Use local vars whenever possible * Cache local template keys, remove defaults from find_template | |||||
| * | | | | Do not add `:include_blank` option if prompt is present | Rafael Mendonça França | 2012-05-13 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Only set `:include_blank` if the value of this options is not present | Rafael Mendonça França | 2012-05-13 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | `:include_blank` should be true if the size option is nil | Rafael Mendonça França | 2012-05-13 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #6225 from ↵ | Rafael Mendonça França | 2012-05-13 | 1 | -0/+5 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acapilleri/select_with_required_true_include_first_option_blank HTML5 validation error with options_from_collection_for_select Fixes #5908 Conflicts: actionpack/CHANGELOG.md | |||||
| | * | | | | Always include the options :include_blank if the select has a required attribute | angelo giovanni capilleri | 2012-05-13 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | and display size 1 and not multiple attribute, Fixes #5908 | |||||
| * | | | | | Merge pull request #6171 from oscardelben/move_token_tag_if_block | Rafael Mendonça França | 2012-05-12 | 1 | -3/+3 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Switch token_tag if block | |||||
| | * | | | | Switch token_tag if block | Oscar Del Ben | 2012-05-05 | 1 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | update example outputs of some asset helpers | Vijay Dev | 2012-05-12 | 1 | -18/+18 | |
| | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Changed /images and /fonts to /assets in the examples of image_path, image_tag and font_path helpers [ci skip] | |||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-12 | 1 | -42/+44 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb | |||||
| | * | | | | Move HTTP Token auth docs above the Token module | Elia Schito | 2012-05-11 | 1 | -42/+44 | |
| | | | | | | ||||||
| * | | | | | Revert "Merge pull request #6142 from spartan-developer/master" | José Valim | 2012-05-12 | 4 | -10/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 667d0bdd90ef6e6b691f0cc4cf5535b8da69f248, reversing changes made to 4ae6bab6bb02c9390188a49f9a749400f6a0ac94. | |||||
| * | | | | | Merge pull request #6142 from spartan-developer/master | José Valim | 2012-05-12 | 4 | -12/+10 | |
| |\ \ \ \ \ | | | | | | | | | | | | | refactored extracting :size => 'XxY' into an extract_size! method | |||||
| | * | | | | | refactored extracting :size => 'XxY' into an extract_size! method | Nicholas Yianilos | 2012-05-03 | 4 | -12/+10 | |
| | | | | | | | ||||||
| * | | | | | | Remove useless load path modifications | Santiago Pastorino | 2012-05-11 | 2 | -9/+0 | |
| | | | | | | | ||||||
| * | | | | | | Lazy load I18n | Santiago Pastorino | 2012-05-11 | 1 | -2/+3 | |
| | | | | | | | ||||||
| * | | | | | | Move require to where it's needed | Santiago Pastorino | 2012-05-11 | 6 | -3/+6 | |
| | | | | | | | ||||||
| * | | | | | | Remove ruby/shim | Santiago Pastorino | 2012-05-11 | 2 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | require 'action_view' is now much faster | |||||
| * | | | | | | Copy literal route constraints to defaults - fixes #3571 and #6224. | Andrew White | 2012-05-11 | 1 | -0/+19 | |
| | | | | | | | ||||||
| * | | | | | | Don't ignore nil positional arguments for url helpers - fixes #6196. | Andrew White | 2012-05-10 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Refactor the handling of default_url_options in integration tests | Andrew White | 2012-05-10 | 1 | -7/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit improves the handling of default_url_options in integration tests by making behave closer to how a real application operates. Specifically the following issues have been addressed: * Options specified in routes.rb are used (fixes #546) * Options specified in controllers are used * Request parameters are recalled correctly * Tests can override default_url_options directly | |||||
| * | | | | | | remove duplicate usage of Rack::Utils.status_code in ↵ | Rafael Magana | 2012-05-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | LogSubscriber#process_action | |||||
| * | | | | | | removing key argument from run_callbacks - fix build | Francesco Rodriguez | 2012-05-10 | 1 | -1/+1 | |
| | |_|_|/ / |/| | | | | ||||||
| * | | | | | Refactor Generator class to not rely on in-place editing the controller | Andrew White | 2012-05-09 | 1 | -5/+10 | |
| | | | | | | ||||||
| * | | | | | Fix bug when url_for changes controller. | Nikita Beloglazov | 2012-05-09 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | fix a couple of formatting issues [ci skip] | Vijay Dev | 2012-05-09 | 1 | -2/+4 | |
| | | | | | | ||||||
| * | | | | | update some examples in asset tag helper docs [ci skip] | Vijay Dev | 2012-05-09 | 1 | -15/+15 | |
| | | | | | | ||||||
| * | | | | | remove redundant and stray line [ci skip] | Vijay Dev | 2012-05-09 | 1 | -2/+0 | |
| | |/ / / |/| | | | ||||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-08 | 5 | -105/+180 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix NumberHelper options wrapping to prevent verbatim blocks being rendered ↵ | Mark J. Titorenko | 2012-05-08 | 1 | -92/+161 | |
| | | | | | | | | | | | | | | | | | | | | | instead of line continuations. While I'm at it, wrap long comment lines consistently. | |||||
| | * | | | | Add example for image_submit_tag with confirmation. [ci skip] | Edward Tsech | 2012-05-08 | 1 | -0/+3 | |
| | | | | | | ||||||
| | * | | | | Add annotaion for class_eval in AbstractController#helper_method [ci skip] | Edward Tsech | 2012-05-08 | 1 | -3/+3 | |
| | | | | | | ||||||
| | * | | | | Improve readability of metaprogramming annotations at AbstractController ↵ | Edward Tsech | 2012-05-08 | 1 | -10/+10 | |
| | | | | | | | | | | | | | | | | | | | | | callbacks. | |||||
| | * | | | | Added reference to I18n.localize, as discussed here: | Ernesto Tagwerker | 2012-05-04 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/issues/4027 | |||||
| * | | | | | If content_type is explicitly passed to the :head method use the value or ↵ | Kunal Shah | 2012-05-08 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | fallback | |||||
| * | | | | | Merge pull request #6182 from shaliko/change_unless_else_into_if_else | José Valim | 2012-05-07 | 1 | -3/+3 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Change unless + else into if + else | |||||
| | * | | | | | Change unless + else into if + else | Shaliko Usubov | 2012-05-06 | 1 | -3/+3 | |
| | | | | | | | ||||||
| * | | | | | | Fix that optimized named routes should also work as singleton methods on the ↵ | Jeremy Kemper | 2012-05-06 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | url_helpers module | |||||
| * | | | | | | doc edits [ci skip] | Vijay Dev | 2012-05-06 | 1 | -3/+2 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #5924 from cjolly/signed-cookies-docs | Vijay Dev | 2012-05-06 | 1 | -3/+5 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Improve signed cookies documentation | |||||
| | * | | | | | Improve signed cookies documentation | Chad Jolly | 2012-04-21 | 1 | -3/+5 | |
| | | | | | | | ||||||
| * | | | | | | Fix typo in submit_tag helper documentation | Alex Soulim | 2012-05-06 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | remove .new from raise ActionController::UnknownFormat | Steven Soroka | 2012-05-06 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Raise a rescuable exception when Rails doesn't know what to do with the ↵ | Steven Soroka | 2012-05-06 | 3 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | format, rather than responding with a head :not_acceptable (406) | |||||
| * | | | | | | check checkboxes with array of strings as :checked option | Vasiliy Ermolovich | 2012-05-05 | 1 | -1/+1 | |
| | |_|_|/ / |/| | | | | ||||||
| * | | | | | Try to convert object passed to debug_hash to hash | Piotr Sarnacki | 2012-05-05 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SessionStore was recently changed to delegate to hash object instead of inherit from it. Since we don't want to extend SessionStore with every method implemented in Hash, it's better to just convert any object passed to debug_hash (which is also better as we don't require to pass Hash instance there, it can be any object that can be converted to Hash). | |||||
| * | | | | | need to dup the default options so that mutations will not impact us | Aaron Patterson | 2012-05-04 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | make sure the superclass matches so load order does not matter | Aaron Patterson | 2012-05-04 | 2 | -2/+2 | |
| | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |