| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Use merge! instead reverse_merge! here | Santiago Pastorino | 2012-05-14 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Remove `:disable_with` in favor of `'data-disable-with'` option from ↵ | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 6 | -57/+13 | |
| |/ / / | | | | | | | | | | `submit_tag`, `button_tag` and `button_to` helpers. | |||||
| * | | | Merge pull request #6220 from frodsan/pass_multiple_value | Rafael Mendonça França | 2012-05-14 | 6 | -18/+25 | |
| |\ \ \ | | | | | | | | | Allow define_attribute_methods to pass multiple values | |||||
| | * | | | updating define_attribute_methods documentation | Francesco Rodriguez | 2012-05-14 | 4 | -5/+5 | |
| | | | | | ||||||
| | * | | | allow define_attribute_methods to pass multiple values | Francesco Rodriguez | 2012-05-14 | 2 | -13/+20 | |
| |/ / / | ||||||
| * | | | Remove not used date variable and another test warning | Carlos Antonio da Silva | 2012-05-14 | 1 | -2/+1 | |
| | | | | ||||||
| * | | | Remove assertion on date from humans.txt tests | José Valim | 2012-05-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Remove dates and environment variables from humans.txt | José Valim | 2012-05-14 | 1 | -2/+0 | |
| | | | | ||||||
| * | | | Merge pull request #6018 from lest/patch-1 | Carlos Antonio da Silva | 2012-05-14 | 3 | -1/+16 | |
| |\ \ \ | | | | | | | | | mailer can be anonymous | |||||
| | * | | | mailer can be anonymous | Sergey Nartimov | 2012-05-13 | 3 | -1/+16 | |
| | | | | | | | | | | | | | | | | | closes #5970 | |||||
| * | | | | Since escape_html_entities_in_json was moved to 3-2-stable, make it true in ↵ | José Valim | 2012-05-14 | 2 | -4/+1 | |
| | | | | | | | | | | | | | | | | | AS, closes #6287 | |||||
| * | | | | MySQL doesn't allow default values for blobs. | Rafael Mendonça França | 2012-05-13 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Remove `:mouseover` option from `image_tag` helper. | Rafael Mendonça França | 2012-05-13 | 3 | -21/+3 | |
| | | | | | ||||||
| * | | | | Merge pull request #3237 from sakuro/data-url-scheme | Rafael Mendonça França | 2012-05-13 | 3 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support data: url scheme Conflicts: actionpack/lib/action_view/asset_paths.rb | |||||
| * | | | | Copy edit [ci skip] | Rafael Mendonça França | 2012-05-13 | 2 | -3/+5 | |
| | | | | | ||||||
| * | | | | Merge pull request #5807 from Antiarchitect/store-improvement | Rafael Mendonça França | 2012-05-13 | 5 | -6/+55 | |
| |\ \ \ \ | | | | | | | | | | | Custom coders support for ActiveRecord::Store. | |||||
| | * | | | | Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be ↵ | Andrey Voronkov | 2012-05-09 | 5 | -6/+55 | |
| | | | | | | | | | | | | | | | | | | | | | used out of the box. | |||||
| * | | | | | Merge pull request #4431 from lest/refactor-1-9 | Rafael Mendonça França | 2012-05-13 | 1 | -7/+3 | |
| |\ \ \ \ \ | | | | | | | | | | | | | use const_defined? with second argument in AS::Dependencies | |||||
| | * | | | | | use const_defined? with second argument in AS::Dependencies | Sergey Nartimov | 2012-05-13 | 1 | -7/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | there is no need in local_const_defined? helper method | |||||
| * | | | | | | Remove dependency on safe_join from number helpers | Carlos Antonio da Silva | 2012-05-13 | 2 | -4/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in 0f848dd54911f0e15c5c3aceabf09582cc6eab16. | |||||
| * | | | | | | Merge pull request #6305 from arunagw/ruby-prof-fixes | Carlos Antonio da Silva | 2012-05-13 | 3 | -2/+3 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Ruby prof fixes | |||||
| | * | | | | | | Need to include "OutputSaftyHelper" here to prevent | Arun Agrawal | 2012-05-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `number_with_delimiter': undefined method `safe_join' for #<ActiveSupport::Testing::Performance::Metrics::Objects | |||||
| | * | | | | | | Fixed ruby-prof changes and let's use latest ruby-prof now. | Arun Agrawal | 2012-05-13 | 2 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #6307 from oscardelben/refactor_app_generator_test | Carlos Antonio da Silva | 2012-05-13 | 1 | -22/+20 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Refactor App Generator Test | |||||
| | * | | | | | | | Refactor App Generator Test | Oscar Del Ben | 2012-05-13 | 1 | -22/+20 | |
| | |/ / / / / / | ||||||
| * | / / / / / | Autoload ActionDispatch::Request::Session to avoid circular require. | Andrew White | 2012-05-13 | 1 | -1/+2 | |
| | |/ / / / / |/| | | | | | ||||||
| * | | | | | | Merge pull request #6308 from nashby/blockless-step | José Valim | 2012-05-13 | 1 | -10/+0 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | remove useless tests for Range#step | |||||
| | * | | | | | | remove useless tests for Range#step | Vasiliy Ermolovich | 2012-05-13 | 1 | -10/+0 | |
| |/ / / / / / | ||||||
| * | | | | | | Remove blockless_step leave all that up to Ruby | Santiago Pastorino | 2012-05-13 | 3 | -15/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes #6297 | |||||
| * | | | | | | Remove remaining require 'rubygems' | Santiago Pastorino | 2012-05-13 | 5 | -9/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #6303 from korny/remove-require-rubygems | Santiago Pastorino | 2012-05-13 | 9 | -12/+0 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | require "rubygems" is obsolete in Ruby 1.9.3 | |||||
| | * | | | | | require "rubygems" is obsolete in Ruby 1.9.3 | Kornelius Kalnbach | 2012-05-13 | 9 | -12/+0 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #6298 from frodsan/fix_todo_skip | Rafael Mendonça França | 2012-05-13 | 1 | -9/+8 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | fixme: use minitest skip instead of return nil | |||||
| | * | | | | fix todo: use minitest skip instead of return nil | Francesco Rodriguez | 2012-05-13 | 1 | -9/+8 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #5729 from oscardelben/use_tap | José Valim | 2012-05-13 | 1 | -5/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Use the more idiomatic tap method | |||||
| | * | | | | | Use the more idiomatic tap method | Oscar Del Ben | 2012-04-04 | 1 | -5/+1 | |
| | | | | | | | ||||||
| * | | | | | | 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 | |||||
| * | | | | | | Copy edit the documentation | Rafael Mendonça França | 2012-05-13 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Do not add `:include_blank` option if prompt is present | Rafael Mendonça França | 2012-05-13 | 2 | -3/+10 | |
| | | | | | | | ||||||
| * | | | | | | Only set `:include_blank` if the value of this options is not present | Rafael Mendonça França | 2012-05-13 | 2 | -1/+7 | |
| | | | | | | | ||||||
| * | | | | | | `:include_blank` should be true if the size option is nil | Rafael Mendonça França | 2012-05-13 | 3 | -17/+25 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #6225 from ↵ | Rafael Mendonça França | 2012-05-13 | 4 | -0/+31 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acapilleri/select_with_required_true_include_first_option_blank HTML5 validation error with options_from_collection_for_select Fixes #5908 Conflicts: actionpack/CHANGELOG.md | |||||
| | * | | | | | | Changed the changelog and documentation about | Angelo Capilleri | 2012-05-13 | 2 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the select method (tag select) forces :include_blank if is required and no multiple and display size is one | |||||
| | * | | | | | | Always include the options :include_blank if the select has a required attribute | angelo giovanni capilleri | 2012-05-13 | 2 | -0/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and display size 1 and not multiple attribute, Fixes #5908 | |||||
| * | | | | | | | Merge pull request #6193 from mhfs/fix_oracle_spec | Rafael Mendonça França | 2012-05-12 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix failing AR test on Oracle | |||||
| | * | | | | | | | Fix failing test on Oracle. Having a duplicated column specified in a | Marcelo Silveira | 2012-05-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | select with order on the same column makes Oracle complain about "column ambiguously defined" when an order is defined on such column (introduced by default order on `first`) (fixes #6147). | |||||
| * | | | | | | | | 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 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Remove tailing spaces :scissors: [ci skip] | Rafael Mendonça França | 2012-05-12 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |