Merge pull request #132 from MITLibraries/update_deps

Bug fixed upstream so we no longer need our fork
MITLibraries · Aug 4, 2016 · 8e8971e · 8e8971e
2 parents 89d1220 + 7c64e18
commit 8e8971e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,8 +3,9 @@ ruby '2.3.1'
 
 gem 'rails', '5.0.0'
 gem 'aws-sdk', '~> 2'
-gem 'bootstrap_form', git: 'https://github.com/MITLibraries/rails-bootstrap-forms',
-                      branch: 'use_parameterize_for_check_box_label_for'
+gem 'bootstrap_form',
+    git: 'https://github.com/bootstrap-ruby/rails-bootstrap-forms.git',
+    ref: 'de93b85'
 gem 'cancancan'
 gem 'delayed_job_active_record'
 gem 'devise'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
-  remote: https://github.com/MITLibraries/rails-bootstrap-forms
-  revision: bae763aceddf818822875871b5059214fb7eab98
-  branch: use_parameterize_for_check_box_label_for
+  remote: https://github.com/bootstrap-ruby/rails-bootstrap-forms.git
+  revision: de93b855371937b05ab1f83339544c82da7738bb
+  ref: de93b85
   specs:
     bootstrap_form (2.4.0)