Merge pull request #312 from mikenicklas/master

Fix ambiguous first argument warning

Author: mattbrictson

CHANGELOG.md

@@ -9,7 +9,7 @@ Features:
 ## [2.6.0][] (2017-02-03)
 
 Bugfixes:
-  - None
+  - Fix ambiguous first argument warning (#311, @mikenicklas)
 
 Features:
   - Add a FormBuilder#custom_control helper [#289](https://github.com/bootstrap-ruby/rails-bootstrap-forms/pull/289)

lib/bootstrap_form/helpers/bootstrap.rb

@@ -79,7 +79,7 @@ def prepend_and_append_input(options, &block)
       end
 
       def input_group_class(add_on_content)
-        if add_on_content.match /btn/
+        if add_on_content.match(/btn/)
           'input-group-btn'
         else
           'input-group-addon'