aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5707 from morgoth/remove-unnecessary-block-in-fetchXavier Noria2012-04-051-1/+1
|\
| * removed unnecessary block when using fetchWojciech Wnętrzak2012-04-021-1/+1
* | Merge pull request #4446 from ayamomiji/patch-1José Valim2012-04-052-1/+8
|\ \
| * | prevent the cache sweeper ignores NoMethodErrorayaya2012-03-292-1/+8
* | | Merge pull request #5716 from jurriaan/tr-gsub-cleanupSantiago Pastorino2012-04-046-8/+8
|\ \ \
| * | | Updated/changed useless tr/gsubsJurriaan Pruis2012-04-036-8/+8
| | |/ | |/|
* | | No need to extend ActiveSupport::Extend hereOscar Del Ben2012-04-041-2/+0
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-042-3/+3
|\ \ \
| * | | Fix AC responder exampleAlexey Vakhov2012-04-041-1/+1
| * | | Remove non-obligatory params in AC respond_to examplesAlexey Vakhov2012-04-031-2/+2
* | | | minor elsif/else typo fixTieg Zaharia2012-04-031-1/+1
| |/ / |/| |
* | | add type option to atom feed entry builderSergey Nartimov2012-04-012-1/+35
* | | Merge pull request #5694 from hardipe/masterSantiago Pastorino2012-04-011-4/+0
|\ \ \ | |/ / |/| |
| * | Useless/Confusing method definition removedhardi2012-04-011-4/+0
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-013-3/+2
|\ \ \
| * | | :success includes the whole 200 range, not just 200.Erich Menge2012-04-011-1/+1
| * | | CSRF messages are no longer controlled by 422.html because InvalidAuthenticit...Tony Primerano2012-03-281-1/+0
| * | | Fix quotes at select_tag examplesAnderson Dias2012-03-281-1/+1
* | | | Merge pull request #5691 from avakhov/form-label-blockJosé Valim2012-04-012-3/+17
|\ \ \ \
| * | | | Small #label method refactoring, thanks @rafaelfrancaAlexey Vakhov2012-04-011-3/+2
| * | | | Block version of label should wrapped in field_with_errors in case of errorAlexey Vakhov2012-04-012-1/+16
| | |/ / | |/| |
* / | | Tests :if option of force_ssl methodAlexey Vakhov2012-04-011-0/+23
|/ / /
* | | Remove not needed requiresSantiago Pastorino2012-03-311-1/+0
* | | Merge pull request #5664 from lest/patch-1Piotr Sarnacki2012-03-311-2/+2
|\ \ \
| * | | use `symbolize_keys` instead of `dup.symbolize_keys!`Sergey Nartimov2012-03-301-2/+2
* | | | Remove obsolete reader from AC::MethodNotAllowed exception classAlexey Vakhov2012-03-311-2/+0
* | | | Remove AC::RenderError class second declarationAlexey Vakhov2012-03-311-3/+0
* | | | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
|/ / /
* | | Merge pull request #5625 from nertzy/prefix_partial_path_with_controller_name...José Valim2012-03-286-13/+79
|\ \ \
| * | | Make controller namespace partial prefix optionalGrant Hutchins2012-03-286-9/+75
| * | | Test that render gets correct exact template nameGrant Hutchins2012-03-281-4/+4
| | |/ | |/|
* | | Merge pull request #5359 from avakhov/missed-commits-from-3-2-stableSantiago Pastorino2012-03-284-2/+29
|\ \ \ | |/ / |/| |
| * | datetime_select should work with -/+ infinity datesJoe Van Dyk2012-03-282-1/+13
| * | Add a test case for layout nil.José Valim2012-03-282-1/+16
* | | Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-282-2/+3
|/ /
* | Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-282-1/+8
* | config.action_view.embed_authenticity_token_in_remote_forms is true by defaultPiotr Sarnacki2012-03-284-21/+21
* | Added config.action_view.embed_authenticity_token_in_remote_formsPiotr Sarnacki2012-03-284-10/+74
* | Add test for default_url_options[:port]Aaron Suggs2012-03-281-0/+12
* | Merge pull request #5621 from rafaelfranca/fix-2492-masterJeremy Kemper2012-03-272-3/+37
|\ \
| * | Check if the options hash already exists and merge it with the anotherRafael Mendonça França2012-03-273-18/+23
| * | Fixing issue #2492 for master branch. ActionView::Base.field_error_proc doesn...Andrey Samsonov2012-03-272-2/+31
* | | Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-masterSantiago Pastorino2012-03-273-8/+12
|\ \ \
| * | | Don't break Haml with textarea newline fix.James Coleman2012-03-273-8/+12
| | |/ | |/|
* / | adds delegetion for eof? to AD::Http::UploadedFileJens Fahnenbruck2012-03-272-1/+7
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-273-2/+21
|\ \ | |/ |/|
| * add missing do [ci skip]Vijay Dev2012-03-271-1/+1
| * Proc objects for caches_page no need controller objectAlexey Vakhov2012-03-271-1/+1
| * added shallow_prefix option description in documantationLukasz Sarnacki2012-03-271-0/+19
| * Fix AC actions caching commentAlexey Vakhov2012-03-241-1/+1