aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* 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
* | If partial is rendered in controller, grab format from templatePiotr Sarnacki2012-03-273-2/+22
* | change number_with_precision to not return negative zerosTim McEwan2012-03-272-0/+2
* | Don't ignore non Enumerable values passed to sanitize (closes #5585)Piotr Sarnacki2012-03-272-0/+29
* | Remove warning added by my own commit :fire:Carlos Antonio da Silva2012-03-261-1/+1
* | Return the same session data object when setting session idCarlos Antonio da Silva2012-03-261-1/+2
* | Merge pull request #5561 from carlosantoniodasilva/form-builder-block-argAaron Patterson2012-03-262-3/+21
|\ \
| * | Properly deprecate the block argument in AV FormBuilderCarlos Antonio da Silva2012-03-232-3/+21
* | | apply form_for namespace option to date_selectSergey Nartimov2012-03-262-1/+12
* | | Merge pull request #5183 from lest/patch-1José Valim2012-03-261-2/+3
|\ \ \
| * | | use content_tag in button_to helperSergey Nartimov2012-03-141-2/+3
* | | | Allow a defining custom member field on resourcesJamie Macey2012-03-252-4/+23
* | | | Merge pull request #5570 from avakhov/ac-caching-splitJeremy Kemper2012-03-241-2/+2
|\ \ \ \
| * | | | ActionController caching small String#split optimizationAlexey Vakhov2012-03-241-2/+2
| | |_|/ | |/| |
* / | | Revert "Return an actual boolean from xml_http_request?"Xavier Noria2012-03-251-1/+1
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-241-1/+1
|\ \ \
| * | | Fixed-width font fix for instance variableJuanjo Bazán2012-03-201-1/+1
* | | | Return an actual boolean from xml_http_request?Tim Pope2012-03-231-1/+1
* | | | Merge pull request #5518 from rafaelfranca/minor-refactorJosé Valim2012-03-231-11/+11
|\ \ \ \
| * | | | Remove code duplicationRafael Mendonça França2012-03-191-11/+11
* | | | | Use the new scope syntaxRafael Mendonça França2012-03-231-1/+1
| |_|_|/ |/| | |
* | | | We dont need to merge in the parameters as thats all being reset by the rack ...David Heinemeier Hansson2012-03-201-1/+0
|/ / /
* | | Fix secure cookies when there are more than one space before the secureRafael Mendonça França2012-03-192-1/+29
* | | Remove exclude option from ActionDispatch::SSLRafael Mendonça França2012-03-192-13/+0
* | | Merge pull request #5503 from jeyb/leap_day_time_date_time_selectorAndrew White2012-03-193-13/+27
|\ \ \ | |/ / |/| |
| * | Fixes issue #5222: DateTimeSelector builds invalid dates on leap day when dis...Jey Balachandran2012-03-183-13/+27
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-191-19/+116
|\ \ \ | |/ / |/| |
| * | respond_with description: changed 'response' to 'format'Mark Thomson2012-03-181-1/+1
| * | Revised comments for respond_withMark Thomson2012-03-181-17/+18
| * | Merge remote-tracking branch 'origin/master'Mark Thomson2012-03-1777-1264/+536
| |\ \
| * | | Revised description for responds_withMark Thomson2012-03-171-19/+115
* | | | time_tag support for blocksAntonio Tapiador del Dujo2012-03-182-2/+11
* | | | Update the guides and CHANGELOGRafael Mendonça França2012-03-171-2/+4
* | | | Whitespaces :scissors:Rafael Mendonça França2012-03-171-1/+1
* | | | Some refactoring and update ActionDispatch::SSL code to use the Rack 1.4.xRafael Mendonça França2012-03-172-37/+13
* | | | Rack::SSL -> ActionDispatch::SSLRafael Mendonça França2012-03-173-0/+237
| |/ / |/| |
* | | Add missing requireSantiago Pastorino2012-03-171-0/+1
* | | Remove unused requireSantiago Pastorino2012-03-171-1/+0
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-171-4/+4
|\ \ \
| * | | Minor clarification in documentation language and spellingMatthew Daubert2012-03-131-4/+4
* | | | Merge pull request #5480 from drogus/rendering-issuesJosé Valim2012-03-178-0/+46
* | | | Should use an argument in http_digest_authentication_test.rbkennyj2012-03-171-1/+1
* | | | Merge pull request #5470 from sandeepravi/warning_fixesJosé Valim2012-03-171-0/+5
|\ \ \ \
| * | | | fixed - warning: instance variable @controller not initializedSandeep2012-03-161-0/+5
* | | | | use consistent explicit module inclusionLuke Gruber2012-03-163-6/+6
|/ / / /
* | | | fixed - warning: ambiguous first argument; put parentheses or even spacesSandeep2012-03-161-1/+1