Merge with master

This commit is contained in:
Chrisbr 2014-05-12 15:26:18 +02:00
commit d97e3603b1
8 changed files with 125 additions and 33 deletions

View file

@ -73,7 +73,7 @@ Formtastic::FormBuilder.required_string = "(required)"
# You can opt-in to new HTML5 browser validations (for things like email and url inputs) by setting
# this to false. Doing so will add a `novalidate` attribute to the `<form>` tag.
# See http://diveintohtml5.org/forms.html#validation for more info.
# Formtastic::FormBuilder.perform_browser_validations = true
Formtastic::FormBuilder.perform_browser_validations = true
#
Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
FormtasticBootstrap::FormBuilder.default_inline_hint_class = FormtasticBootstrap::FormBuilder.default_block_hint_class