Merge pull request #13 from CloCkWeRX/more_upgrades

Update jquery-rails jquery-ui-rails and more
fatfreecrm · Dec 5, 2016 · 4fe664f · 4fe664f
2 parents a91f441 + 327c495
commit 4fe664f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -146,11 +146,11 @@ GEM
     i18n (0.7.0)
     i18n_data (0.7.0)
     jquery-migrate-rails (1.2.1)
-    jquery-rails (4.0.5)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.2.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.5)
+    jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
     json (1.8.3)
     kgio (2.10.0)
@@ -332,10 +332,10 @@ GEM
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    thin (1.6.4)
+    thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
-      rack (~> 1.0)
+      rack (>= 1, < 3)
     thor (0.19.4)
     thread_safe (0.3.5)
     tilt (2.0.5)