aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Collapse)AuthorAgeFilesLines
* Add distance_of_time_in_words example for secondsAlexey Vakhov2012-04-221-0/+3
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-212-2/+2
|\
| * Comma missedAlexey Vakhov2012-04-211-1/+1
| |
| * Fix example in ActionView::Helpers::FormHelperThibaut Courouble2012-04-201-1/+1
| |
* | converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-161-1/+1
| |
* | catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-161-1/+1
|/
* Merge pull request #5814 from lest/patch-4Piotr Sarnacki2012-04-131-12/+13
|\ | | | | don't duplicate default values in text helper
| * don't duplicate default values in text helperSergey Nartimov2012-04-111-12/+13
| |
* | avoid autolinking by rdoc [ci skip]Vijay Dev2012-04-121-2/+2
| |
* | Merge pull request #5746 from jmbejar/index_method_form_builderSantiago Pastorino2012-04-111-5/+22
|\ \ | |/ |/| Add method FormBuilder#index
| * Add index method to FormBuilder. Useful when you use field_for and need to ↵Jorge Bejar2012-04-111-5/+22
| | | | | | | | know the index number into the iteration.
* | no need in temporary array in number_to_phone helperSergey Nartimov2012-04-091-2/+2
| |
* | Adding itemscope to list of boolean attributes.Frankie Roberto2012-04-091-1/+1
| | | | | | | | | | | | 'itemscope' is defined within HTML5 for use in microdata markup. See http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.ht ml#attr-itemscope
* | Merge pull request #5748 from ai/no_type_in_html5Jeremy Kemper2012-04-087-63/+63
|\ \ | | | | | | Remove unnecessary in HTML 5 type attribute with default value
| * | Remove unnecessary in HTML 5 type attribute with default valueAndrey A.I. Sitnik2012-04-057-63/+63
| | |
* | | use extract_options! in cycle helperSergey Nartimov2012-04-071-6/+4
| | |
* | | pass default value as argument to fetchSergey Nartimov2012-04-061-1/+1
| | |
* | | Merge pull request #5182 from castlerock/content_tag_instead_stringXavier Noria2012-04-051-2/+2
|\ \ \ | |_|/ |/| | content_tag used instead string for option
| * | content_tag used instead string for optionVishnu Atrai2012-02-261-2/+2
| | |
* | | Merge pull request #5707 from morgoth/remove-unnecessary-block-in-fetchXavier Noria2012-04-051-1/+1
|\ \ \ | |_|/ |/| | removed unnecessary block when using fetch
| * | removed unnecessary block when using fetchWojciech Wnętrzak2012-04-021-1/+1
| | |
* | | Merge pull request #5716 from jurriaan/tr-gsub-cleanupSantiago Pastorino2012-04-041-2/+2
|\ \ \ | | | | | | | | Updated/changed unneeded tr/gsubs
| * | | Updated/changed useless tr/gsubsJurriaan Pruis2012-04-031-2/+2
| |/ /
* / / minor elsif/else typo fixTieg Zaharia2012-04-031-1/+1
|/ /
* | add type option to atom feed entry builderSergey Nartimov2012-04-011-1/+4
| | | | | | | | closes #5672
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-011-1/+1
|\ \
| * | Fix quotes at select_tag examplesAnderson Dias2012-03-281-1/+1
| | |
* | | 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-011-1/+2
| | |
* | | use `symbolize_keys` instead of `dup.symbolize_keys!`Sergey Nartimov2012-03-301-2/+2
| | |
* | | Merge pull request #5625 from ↵José Valim2012-03-282-3/+16
|\ \ \ | | | | | | | | | | | | | | | | nertzy/prefix_partial_path_with_controller_namespace Add config option to turn off prefixing partial path with controller namespace
| * | | Make controller namespace partial prefix optionalGrant Hutchins2012-03-282-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | config.action_view.prefix_partial_path_with_controller_namespace This allows you to choose to render @post using /posts/_post.erb instead of /admin/posts/_post.erb inside Admin::PostsController.
* | | | Merge pull request #5359 from avakhov/missed-commits-from-3-2-stableSantiago Pastorino2012-03-281-1/+1
|\ \ \ \ | |/ / / |/| | | Missed commits from 3-2-stable
| * | | datetime_select should work with -/+ infinity datesJoe Van Dyk2012-03-281-1/+1
| | | |
* | | | Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-281-2/+2
|/ / / | | | | | | | | | Closes #5632
* | | Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-281-1/+1
| | | | | | | | | | | | | | | 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-282-2/+2
| | | | | | | | | | | | | | | | | | | | | 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-282-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge pull request #5621 from rafaelfranca/fix-2492-masterJeremy Kemper2012-03-271-3/+3
|\ \ \ | | | | | | | | 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-272-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | hash. Closes #2492 and #5615
| * | | Fixing issue #2492 for master branch. ActionView::Base.field_error_proc ↵Andrey Samsonov2012-03-271-2/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | 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
* / / Don't break Haml with textarea newline fix.James Coleman2012-03-272-2/+6
|/ / | | | | | | | | | | 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.
* | If partial is rendered in controller, grab format from templatePiotr Sarnacki2012-03-271-2/+8
| | | | | | | | | | | | | | | | | | 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-271-0/+1
| |
* | Merge pull request #5561 from carlosantoniodasilva/form-builder-block-argAaron Patterson2012-03-261-3/+9
|\ \ | | | | | | Properly deprecate the block argument in AV FormBuilder
| * | Properly deprecate the block argument in AV FormBuilderCarlos Antonio da Silva2012-03-231-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-1/+4
| | |
* | | 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
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/ruby_on_rails_guides_guidelines.textile