aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #6186 from anydiem/fix_unconventional_pksRafael Mendonça França2012-05-142-1/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Set the primary key during #copy_table if necessary. Fixes [#2312]Sean Scally2012-05-142-1/+13
* | | | | | Use merge! instead reverse_merge! hereSantiago Pastorino2012-05-141-1/+1
* | | | | | Remove `:disable_with` in favor of `'data-disable-with'` option from `submit_...Carlos Galdino + Rafael Mendonça França2012-05-146-57/+13
|/ / / / /
* | | | | Merge pull request #6220 from frodsan/pass_multiple_valueRafael Mendonça França2012-05-146-18/+25
|\ \ \ \ \
| * | | | | updating define_attribute_methods documentationFrancesco Rodriguez2012-05-144-5/+5
| * | | | | allow define_attribute_methods to pass multiple valuesFrancesco Rodriguez2012-05-142-13/+20
|/ / / / /
* | | | | Remove not used date variable and another test warningCarlos Antonio da Silva2012-05-141-2/+1
* | | | | Remove assertion on date from humans.txt testsJosé Valim2012-05-141-1/+1
* | | | | Remove dates and environment variables from humans.txtJosé Valim2012-05-141-2/+0
* | | | | Merge pull request #6018 from lest/patch-1Carlos Antonio da Silva2012-05-143-1/+16
|\ \ \ \ \
| * | | | | mailer can be anonymousSergey Nartimov2012-05-133-1/+16
* | | | | | Since escape_html_entities_in_json was moved to 3-2-stable, make it true in A...José Valim2012-05-142-4/+1
* | | | | | MySQL doesn't allow default values for blobs.Rafael Mendonça França2012-05-131-2/+2
* | | | | | Remove `:mouseover` option from `image_tag` helper.Rafael Mendonça França2012-05-133-21/+3
* | | | | | Merge pull request #3237 from sakuro/data-url-schemeRafael Mendonça França2012-05-133-3/+4
* | | | | | Copy edit [ci skip]Rafael Mendonça França2012-05-132-3/+5
* | | | | | Merge pull request #5807 from Antiarchitect/store-improvementRafael Mendonça França2012-05-135-6/+55
|\ \ \ \ \ \
| * | | | | | Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be use...Andrey Voronkov2012-05-095-6/+55
* | | | | | | Merge pull request #4431 from lest/refactor-1-9Rafael Mendonça França2012-05-131-7/+3
|\ \ \ \ \ \ \
| * | | | | | | use const_defined? with second argument in AS::DependenciesSergey Nartimov2012-05-131-7/+3
* | | | | | | | Remove dependency on safe_join from number helpersCarlos Antonio da Silva2012-05-132-4/+3
* | | | | | | | Merge pull request #6305 from arunagw/ruby-prof-fixesCarlos Antonio da Silva2012-05-133-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Need to include "OutputSaftyHelper" here to preventArun Agrawal2012-05-131-0/+1
| * | | | | | | | Fixed ruby-prof changes and let's use latest ruby-prof now.Arun Agrawal2012-05-132-2/+2
* | | | | | | | | Merge pull request #6307 from oscardelben/refactor_app_generator_testCarlos Antonio da Silva2012-05-131-22/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor App Generator TestOscar Del Ben2012-05-131-22/+20
| |/ / / / / / / /
* | / / / / / / / Autoload ActionDispatch::Request::Session to avoid circular require.Andrew White2012-05-131-1/+2
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #6308 from nashby/blockless-stepJosé Valim2012-05-131-10/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | remove useless tests for Range#stepVasiliy Ermolovich2012-05-131-10/+0
|/ / / / / / / /
* | | | | | | | Remove blockless_step leave all that up to RubySantiago Pastorino2012-05-133-15/+1
* | | | | | | | Remove remaining require 'rubygems'Santiago Pastorino2012-05-135-9/+1
* | | | | | | | Merge pull request #6303 from korny/remove-require-rubygemsSantiago Pastorino2012-05-139-12/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | require "rubygems" is obsolete in Ruby 1.9.3Kornelius Kalnbach2012-05-139-12/+0
|/ / / / / / /
* | | | | | | Merge pull request #6298 from frodsan/fix_todo_skipRafael Mendonça França2012-05-131-9/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | fix todo: use minitest skip instead of return nilFrancesco Rodriguez2012-05-131-9/+8
* | | | | | | Merge pull request #5729 from oscardelben/use_tapJosé Valim2012-05-131-5/+1
|\ \ \ \ \ \ \
| * | | | | | | Use the more idiomatic tap methodOscar Del Ben2012-04-041-5/+1
* | | | | | | | Merge pull request #6293 from carlosantoniodasilva/render-partial-refactorJosé Valim2012-05-132-38/+37
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Improve and cleanup a bit partial rendererCarlos Antonio da Silva2012-05-122-38/+37
* | | | | | | | Copy edit the documentationRafael Mendonça França2012-05-131-1/+1
* | | | | | | | Do not add `:include_blank` option if prompt is presentRafael Mendonça França2012-05-132-3/+10
* | | | | | | | Only set `:include_blank` if the value of this options is not presentRafael Mendonça França2012-05-132-1/+7
* | | | | | | | `:include_blank` should be true if the size option is nilRafael Mendonça França2012-05-133-17/+25
* | | | | | | | Merge pull request #6225 from acapilleri/select_with_required_true_include_fi...Rafael Mendonça França2012-05-134-0/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Changed the changelog and documentation aboutAngelo Capilleri2012-05-132-0/+5
| * | | | | | | | Always include the options :include_blank if the select has a required attributeangelo giovanni capilleri2012-05-132-0/+26
* | | | | | | | | Merge pull request #6193 from mhfs/fix_oracle_specRafael Mendonça França2012-05-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix failing test on Oracle. Having a duplicated column specified in aMarcelo Silveira2012-05-071-1/+1
* | | | | | | | | | Merge pull request #6171 from oscardelben/move_token_tag_if_blockRafael Mendonça França2012-05-121-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |