Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #6317 from korny/routes-draw-backtrace | Piotr Sarnacki | 2012-05-14 | 4 | -3/+55 | |
|\ \ \ \ \ | ||||||
| * | | | | | add tests and external file backtrace for Routing::Mapper#draw | Kornelius Kalnbach | 2012-05-15 | 4 | -3/+55 | |
* | | | | | | Merge pull request #6186 from anydiem/fix_unconventional_pks | Rafael Mendonça França | 2012-05-14 | 2 | -1/+13 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Set the primary key during #copy_table if necessary. Fixes [#2312] | Sean Scally | 2012-05-14 | 2 | -1/+13 | |
* | | | | | | 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 `submit_... | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 6 | -57/+13 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #6220 from frodsan/pass_multiple_value | Rafael Mendonça França | 2012-05-14 | 6 | -18/+25 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | Sergey Nartimov | 2012-05-13 | 3 | -1/+16 | |
* | | | | | | Since escape_html_entities_in_json was moved to 3-2-stable, make it true in A... | José Valim | 2012-05-14 | 2 | -4/+1 | |
* | | | | | | 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 | |
* | | | | | | 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. JSON, YAML, Marshal can be use... | Andrey Voronkov | 2012-05-09 | 5 | -6/+55 | |
* | | | | | | | 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 | Sergey Nartimov | 2012-05-13 | 1 | -7/+3 | |
* | | | | | | | | Remove dependency on safe_join from number helpers | Carlos Antonio da Silva | 2012-05-13 | 2 | -4/+3 | |
* | | | | | | | | Merge pull request #6305 from arunagw/ruby-prof-fixes | Carlos Antonio da Silva | 2012-05-13 | 3 | -2/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Need to include "OutputSaftyHelper" here to prevent | Arun Agrawal | 2012-05-13 | 1 | -0/+1 | |
| * | | | | | | | | 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 | 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 | 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 | |
* | | | | | | | | 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 | 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 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | 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 | 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 | Carlos Antonio da Silva | 2012-05-12 | 2 | -38/+37 | |
* | | | | | | | | 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 acapilleri/select_with_required_true_include_fi... | Rafael Mendonça França | 2012-05-13 | 4 | -0/+31 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Changed the changelog and documentation about | Angelo Capilleri | 2012-05-13 | 2 | -0/+5 | |
| * | | | | | | | | Always include the options :include_blank if the select has a required attribute | angelo giovanni capilleri | 2012-05-13 | 2 | -0/+26 | |
* | | | | | | | | | Merge pull request #6193 from mhfs/fix_oracle_spec | Rafael Mendonça França | 2012-05-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ |