aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5625 from nertzy/prefix_partial_path_with_controller_name...José Valim2012-03-282-3/+16
|\
| * Make controller namespace partial prefix optionalGrant Hutchins2012-03-282-3/+16
* | Merge pull request #5359 from avakhov/missed-commits-from-3-2-stableSantiago Pastorino2012-03-282-1/+2
|\ \ | |/ |/|
| * datetime_select should work with -/+ infinity datesJoe Van Dyk2012-03-281-1/+1
| * Add a test case for layout nil.José Valim2012-03-281-0/+1
* | Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-281-2/+2
|/
* Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-281-1/+1
* config.action_view.embed_authenticity_token_in_remote_forms is true by defaultPiotr Sarnacki2012-03-282-2/+2
* Added config.action_view.embed_authenticity_token_in_remote_formsPiotr Sarnacki2012-03-282-8/+24
* Merge pull request #5621 from rafaelfranca/fix-2492-masterJeremy Kemper2012-03-271-3/+3
|\
| * Check if the options hash already exists and merge it with the anotherRafael Mendonça França2012-03-272-12/+5
| * Fixing issue #2492 for master branch. ActionView::Base.field_error_proc doesn...Andrey Samsonov2012-03-271-2/+9
* | Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-masterSantiago Pastorino2012-03-272-2/+6
|\ \
| * | Don't break Haml with textarea newline fix.James Coleman2012-03-272-2/+6
* | | adds delegetion for eof? to AD::Http::UploadedFileJens Fahnenbruck2012-03-271-1/+1
|/ /
* | 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-271-2/+8
* | change number_with_precision to not return negative zerosTim McEwan2012-03-271-0/+1
* | Don't ignore non Enumerable values passed to sanitize (closes #5585)Piotr Sarnacki2012-03-271-0/+11
* | 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-261-3/+9
|\ \
| * | Properly deprecate the block argument in AV FormBuilderCarlos Antonio da Silva2012-03-231-3/+9
* | | apply form_for namespace option to date_selectSergey Nartimov2012-03-261-1/+4
* | | 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-251-4/+5
* | | | 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
* | | | 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-191-1/+1
* | | Remove exclude option from ActionDispatch::SSLRafael Mendonça França2012-03-191-7/+0
* | | Merge pull request #5503 from jeyb/leap_day_time_date_time_selectorAndrew White2012-03-191-6/+6
|\ \ \ | |/ / |/| |
| * | Fixes issue #5222: DateTimeSelector builds invalid dates on leap day when dis...Jey Balachandran2012-03-181-6/+6
* | | 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-1737-637/+163
| |\ \
| * | | Revised description for responds_withMark Thomson2012-03-171-19/+115
* | | | time_tag support for blocksAntonio Tapiador del Dujo2012-03-181-2/+7
* | | | Whitespaces :scissors:Rafael Mendonça França2012-03-171-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 03:41:43 +0000