aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-172-5/+7
|\
| * fix word_wrap eg output [ci skip]Vijay Dev2012-05-171-1/+3
| * Fix code example for word_wrap helper.Hendy Tanata2012-05-171-2/+2
| * Update action view context docs.Oscar Del Ben2012-05-151-2/+2
* | Don't need to force size to nilRafael Mendonça França2012-05-164-10/+0
* | Document the usage of grouped_options_for_select with divider optionRafael Mendonça França2012-05-161-1/+19
* | Make :prompt work as documentedRafael Mendonça França2012-05-163-3/+16
* | Test deprecation and fix the documentation of grouped_options_for_selectRafael Mendonça França2012-05-162-3/+6
* | Merge pull request #2237 from jackdempsey/log_redirect_toAaron Patterson2012-05-161-0/+1
|\ \
| * | log at debug level what line caused the redirect_toJack Dempsey2012-05-161-0/+1
* | | Merge pull request #5369 from Greenie0506/add_separator_to_grouped_options_fo...Aaron Patterson2012-05-162-4/+44
|\ \ \
| * | | Add separator argument to grouped_options_for_selectGreenie05062012-05-152-4/+44
* | | | Merge pull request #6273 from KensoDev/feature/simple_format_refactoringRafael Mendonça França2012-05-152-9/+27
|\ \ \ \ | |/ / / |/| | |
| * | | Added the wrapper tag option to simple_formatAvi Tzurel2012-05-142-2/+12
| * | | simple_format refactoringAvi Tzurel2012-05-141-9/+17
* | | | Revert "Revert "Remove `:disable_with` in favor of `'data-disable-with'` opti...José Valim2012-05-155-55/+11
* | | | Revert "Remove `:disable_with` in favor of `'data-disable-with'` option from ...José Valim2012-05-155-11/+55
| |_|/ |/| |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-1532-152/+23
|\ \ \
| * | | Removing ==Examples and last blank lines of docs from actionpackFrancesco Rodriguez2012-05-1532-183/+56
| * | | mispelling asset_tag_helperAngelo Capilleri2012-05-131-1/+1
* | | | add tests and external file backtrace for Routing::Mapper#drawKornelius Kalnbach2012-05-154-3/+55
* | | | 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-145-55/+11
| |/ / |/| |
* | | 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
* | | Remove dependency on safe_join from number helpersCarlos Antonio da Silva2012-05-131-1/+1
* | | Autoload ActionDispatch::Request::Session to avoid circular require.Andrew White2012-05-131-1/+2
* | | 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
* | | | 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-133-0/+29
|\ \ \ \
| * | | | Changed the changelog and documentation aboutAngelo Capilleri2012-05-131-0/+3
| * | | | Always include the options :include_blank if the select has a required attributeangelo giovanni capilleri2012-05-132-0/+26
* | | | | Merge pull request #6171 from oscardelben/move_token_tag_if_blockRafael Mendonça França2012-05-121-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Switch token_tag if blockOscar Del Ben2012-05-051-3/+3
* | | | | update example outputs of some asset helpersVijay Dev2012-05-121-18/+18
| |_|/ / |/| | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-121-42/+44
|\ \ \ \
| * | | | Move HTTP Token auth docs above the Token moduleElia Schito2012-05-111-42/+44
* | | | | Revert "Merge pull request #6142 from spartan-developer/master"José Valim2012-05-124-10/+12
* | | | | mispelling errors in render_text_test.rb and sqlite_specific_schemaangelo giovanni capilleri2012-05-121-2/+2
* | | | | Merge pull request #6142 from spartan-developer/masterJosé Valim2012-05-124-12/+10
|\ \ \ \ \
| * | | | | refactored extracting :size => 'XxY' into an extract_size! methodNicholas Yianilos2012-05-034-12/+10
* | | | | | mispelling error in actionpach changelogangelo giovanni capilleri2012-05-121-1/+1
* | | | | | Add test directory to TestTask's libsSantiago Pastorino2012-05-111-0/+1
* | | | | | Remove useless load path modificationsSantiago Pastorino2012-05-114-18/+0
* | | | | | Lazy load I18nSantiago Pastorino2012-05-111-2/+3
* | | | | | Move require to where it's neededSantiago Pastorino2012-05-116-3/+6
* | | | | | Remove ruby/shimSantiago Pastorino2012-05-112-2/+1