Update to bootstrap_form 2.1.1 for Rails 4.1 compatibility

Gemfile

@@ -33,7 +33,7 @@ gem 'whenever', '~> 0.9.4'
 gem 'active_link_to', '~> 1.0.0'
 gem 'bootstrap-sass', '~> 2.3.1.0'
 gem 'bootstrap-will_paginate', '~> 1.0.0'
-gem 'bootstrap_form', '~> 0.3.2'
+gem 'bootstrap_form', '~> 2.1.1'
 gem 'haml', '~> 4.0.1'
 gem 'jquery-rails', '~> 2.2.1'
 gem 'will_paginate', '~> 3.1.6'

Gemfile.lock

@@ -60,7 +60,7 @@ GEM
       sass (~> 3.2)
     bootstrap-will_paginate (1.0.0)
       will_paginate
-    bootstrap_form (0.3.2)
+    bootstrap_form (2.1.1)
     braintree (2.101.0)
       builder (>= 2.0.0)
     bson (3.2.7)
@@ -337,7 +337,7 @@ DEPENDENCIES
   binding_of_caller (~> 1.0.0)
   bootstrap-sass (~> 2.3.1.0)
   bootstrap-will_paginate (~> 1.0.0)
-  bootstrap_form (~> 0.3.2)
+  bootstrap_form (~> 2.1.1)
   braintree (~> 2.101.0)
   bugsnag (~> 5.1.0)
   dalli

app/views/registrations/_form.html.haml

@@ -34,8 +34,7 @@
                 = f.check_box :waiver_accepted, value: 1, label: raw('I have read, understand, and accept the <br /> AFDC\'s <a href="http://blog.afdc.com/wp-content/uploads/2012/05/2012-AFDC-Waiver-Minors.pdf">liability waiver</a> and <a href="http://www.afdc.com/refund-policy/">refund policy</a>.')
                 - if @registration.errors[:waiver_accepted].any?
                     = f.alert_message @registration.errors[:waiver_accepted].first
-    = f.actions do
-        - if @registration.new_record?
-            = f.primary "Register", disable_with: 'Registering...'
-        - else
-            = f.primary "Update", disable_with: 'Updating...'
+    - if @registration.new_record?
+        = f.submit "Register", disable_with: 'Registering...', class: "btn btn-primary"
+    - else
+        = f.submit "Update", disable_with: 'Updating...', class: "btn btn-primary"

app/views/users/_form.html.haml

@@ -56,8 +56,7 @@
 								COVID Admin
 
 
-	= f.actions do 
-		- if @user.new_record?
-			= f.primary "Create my Account"
-		- else
-			= f.primary "Update Account"
+	- if @user.new_record?
+		= f.submit "Create my Account", class: "btn btn-primary"
+	- else
+		= f.submit "Update Account", class: "btn btn-primary"

app/views/users/edit_avatar.html.haml

@@ -19,6 +19,5 @@
 		= bootstrap_form_for(@user, html: { class: 'form-horizontal' }, url: update_avatar_user_path(@user), method: 'PUT', help: :block) do |f|
 			= f.alert_message "Please fix the errors below."
 			= f.file_field :avatar, label: 'Upload file'
-			= f.actions do 
-				= f.primary "Upload Image", disable_with: 'Uploading...'
+			= f.submit "Upload Image", disable_with: 'Uploading...', class: "btn btn-primary"