aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5359 from avakhov/missed-commits-from-3-2-stableSantiago Pastorino2012-03-284-2/+29
|\ | | | | Missed commits from 3-2-stable
| * 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
|/ | | | Closes #5632
* Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-282-1/+8
| | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it.
* config.action_view.embed_authenticity_token_in_remote_forms is true by defaultPiotr Sarnacki2012-03-284-21/+21
| | | | | | | Changed default value for `config.action_view.embed_authenticity_token_in_remote_forms` to `false`. This change breaks remote forms that need to work also without javascript, so if you need such behavior, you can either set it to `true` or explicitly pass `:authenticity_token => true` in form options
* Added config.action_view.embed_authenticity_token_in_remote_formsPiotr Sarnacki2012-03-284-10/+74
| | | | | | | | | | | | There is a regression introduced in 16ee611fa, which breaks remote forms that should also work without javascript. This commit introduces config option that allows to configure this behavior defaulting to the old behavior (ie. include authenticity token in remote forms by default) Conflicts: actionpack/CHANGELOG.md
* 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
|\ | | | | Fix label_tag to merge the options hash with the object hash
| * Check if the options hash already exists and merge it with the anotherRafael Mendonça França2012-03-273-18/+23
| | | | | | | | | | | | hash. Closes #2492 and #5615
| * Fixing issue #2492 for master branch. ActionView::Base.field_error_proc ↵Andrey Samsonov2012-03-272-2/+31
| | | | | | | | | | | | | | | | doesn't call for label. objectify_options method should be applied to the proper options arg. See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
* | 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. (master)
| * | Don't break Haml with textarea newline fix.James Coleman2012-03-273-8/+12
| | | | | | | | | | | | | | | | | | See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.) Also fix 6 more tests that didn't yet have the newline expectation.
* | | adds delegetion for eof? to AD::Http::UploadedFileJens Fahnenbruck2012-03-272-1/+7
|/ / | | | | | | | | if you want to read the file you may need to ask if there is something to read from
* | 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
| | | | | | | | It is in response for confusion in issue #5301
| * 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
| | | | | | | | | | | | | | | | | | Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header.
* | 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
| | | | | | | | | | | | | | | | | | When someone accidentally passes a string to sanitize like: sanitize("<span>foo</span>", :tags => "b") there is no indication that it's the wrong way and span will not be removed.
* | Remove warning added by my own commit :fire:Carlos Antonio da Silva2012-03-261-1/+1
| | | | | | | | Commit: 7a0cf2f5294e8bcef547642435636b394340a3e4
* | 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 FormBuilder
| * | Properly deprecate the block argument in AV FormBuilderCarlos Antonio da Silva2012-03-232-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 56089ca986c767763f29159c8de0aa1ebabfd4d2 introduced a backward incompatible change by changing the method signature of the FormBuilder. This brings back the same method signature warning in case someone gives a block to the builder. More info: https://github.com/rails/rails/commit/56089ca986c767763f29159c8de0aa1ebabfd4d2#commitcomment-1116166
* | | 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 helper
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, resources routes are created with :resource/:id. A model defining to_param can make prettier urls by using something more readable than an integer ID, but since the route picks it up as :id you wind up with awkward User.find_by_username(params[:id]) calls. By overriding the key to be used in @request.params you can be more obvious in your intent.
* | | | Merge pull request #5570 from avakhov/ac-caching-splitJeremy Kemper2012-03-241-2/+2
|\ \ \ \ | | | | | | | | | | ActionController caching small String#split optimization
| * | | | 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
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: This commit changes code that was committed some year and a half ago. The original code is an ordinary predicate that delegates straight to a boolean operator with no further unnecessaru adorments, as clearly explained in #5329. This change also may confuse users who may now believe they can rely now on singletons, while predicates in Rails rely on standard Ruby semantics for boolean values and guarantee no singletons whatsover. This reverts commit 6349791d5aaf652631b29f1371701fc2985fda83.
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-241-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: guides/source/ruby_on_rails_guides_guidelines.textile
| * | | 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 duplication
| * | | | 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
|/ / / | | | | | | | | | headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)
* | | Fix secure cookies when there are more than one space before the secureRafael Mendonça França2012-03-192-1/+29
| | | | | | | | | | | | keyword
* | | 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 days
| * | Fixes issue #5222: DateTimeSelector builds invalid dates on leap day when ↵Jey Balachandran2012-03-183-13/+27
| | | | | | | | | | | | discarding both day and month.
* | | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 19:00:01 +0000