aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Remove `:disable_with` in favor of `'data-disable-with'` opti...José Valim2012-05-156-57/+13
* Revert "Remove `:disable_with` in favor of `'data-disable-with'` option from ...José Valim2012-05-156-13/+57
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-1570-341/+161
|\
| * missing dot [ci skip]Vijay Dev2012-05-151-1/+1
| * copy edit asset guide [ci skip]Vijay Dev2012-05-151-7/+5
| * Removing ==Examples and last blank lines of docs from actionpackFrancesco Rodriguez2012-05-1532-183/+56
| * code-format italicized 'production' env [ci skip]Mark Rushakoff2012-05-141-1/+1
| * s/aff/add [ci skip]Mark Rushakoff2012-05-141-1/+1
| * Add documentation for arel_tableOscar Del Ben2012-05-141-0/+8
| * Minor editing of getting started guideOscar Del Ben2012-05-141-3/+11
| * Merge branch 'master' of github.com:lifo/docrailsOscar Del Ben2012-05-14252-1613/+3273
| |\
| | * remove docs on Range#stepVasiliy Ermolovich2012-05-141-12/+0
| | * Removing ==Examples and last blank lines of docs from railtiesFrancesco Rodriguez2012-05-146-61/+0
| | * 'Netherlands locale' does not make any sense, it's Dutch locale [ci skip]Ayrton De Craene2012-05-141-2/+2
| | * Improved the readability of some sentences [ci skip]Ayrton De Craene2012-05-141-1/+1
| | * fix format in getting started guide [ci skip]Vijay Dev2012-05-141-1/+1
| | * adding examples to deep_dup methodFrancesco Rodriguez2012-05-141-1/+23
| | * Missed colonAlexey Vakhov2012-05-141-1/+1
| | * removing unnecessary 'examples' noise from activesupportFrancesco Rodriguez2012-05-1321-74/+11
| | * Fixing Hash#stringify_keys docsFrancesco Rodriguez2012-05-131-1/+1
| | * Merge pull request #98 from acapilleri/mispelling_assetAngelo Capilleri2012-05-131-1/+1
| | |\
| | | * mispelling asset_tag_helperAngelo Capilleri2012-05-131-1/+1
| | * | Correct code wrapping around content of welcome/index.html.erbRyan Bigg2012-05-141-2/+2
| | * | Wrap 'Missing template posts/new' error message in a blockquote for better fo...Ryan Bigg2012-05-141-2/+2
| | * | Rails actually has one root route definedRyan Bigg2012-05-141-1/+1
| | * | Separate CR out in CRUD explanation, explain each letter one at a timeRyan Bigg2012-05-141-1/+1
| | * | Re-enforce/re-explain what happens when you go to root route (Welcome#index) ...Ryan Bigg2012-05-141-1/+1
| | * | Briefly explain static file routing in the getting started guideRyan Bigg2012-05-141-1/+1
| | |/
| | * marking self in Hash#symbolize_keys!Francesco Rodriguez2012-05-131-1/+1
| | * added example to Hash#symbolize_keysFrancesco Rodriguez2012-05-131-2/+5
| | * unnecessary 'examples' noise in Hash#assert_valid_keys docsFrancesco Rodriguez2012-05-131-1/+0
| | * added example to Hash#stringify_keysFrancesco Rodriguez2012-05-131-1/+5
| | * adding examples to Hash#deep_merge methodFrancesco Rodriguez2012-05-131-2/+7
| | * Update docs to public_send for Object#tryOscar Del Ben2012-05-131-1/+1
| | * update docs on Object#tryVasiliy Ermolovich2012-05-131-1/+1
| | * [guides] add local precompilation sectionRichard Hulse2012-05-131-1/+36
| * | Initial proof reading of getting started guideOscar Del Ben2012-05-071-19/+22
* | | Merge pull request #6318 from mpapis/masterJosé Valim2012-05-151-0/+8
|\ \ \
| * | | prevent using already loaded Gemfile for 'bundle install', fix #6314Michal Papis2012-05-151-0/+8
|/ / /
* | | Merge pull request #6317 from korny/routes-draw-backtracePiotr Sarnacki2012-05-144-3/+55
|\ \ \
| * | | add tests and external file backtrace for Routing::Mapper#drawKornelius Kalnbach2012-05-154-3/+55
* | | | 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