diff --git a/Gemfile b/Gemfile
index 042f17f8c..3bd130a70 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ gem 'bootstrap-sass', '= 3.1.1.0'
 gem 'coffee-rails', '= 3.2.2'
 gem 'uglifier', '= 1.2.3'
 gem 'jquery-rails', '= 3.1.0'
-gem 'jquery-ui-rails', '= 4.1.2'
+gem 'jquery-ui-rails', '6.0.0'
 gem 'json', '= 1.8.3'
 gem 'sinatra', '= 1.3.2'
 gem 'selenium-webdriver', '= 2.44.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index cd0857e72..a41c2bcc6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -170,7 +170,7 @@ GEM
     bootstrap-sass (3.1.1.0)
       sass (~> 3.2)
     browser (2.5.3)
-    builder (3.0.4)
+    builder (3.2.4)
     cancan (1.6.10)
     capistrano (2.14.2)
       highline
@@ -210,6 +210,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
+    concurrent-ruby (1.2.0)
     deep_merge (1.1.1)
     deface (0.9.1)
       nokogiri (~> 1.5.0)
@@ -263,7 +264,8 @@ GEM
     highline (1.7.8)
     hike (1.2.3)
     htmlentities (4.3.4)
-    i18n (0.7.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     i18n-js (2.1.2)
       i18n
     inherited_resources (1.4.1)
@@ -273,8 +275,8 @@ GEM
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.1.2)
-      railties (>= 3.1.0)
+    jquery-ui-rails (6.0.0)
+      railties (>= 3.2.16)
     jruby-pageant (1.1.1)
     json (1.8.3)
     jwt (1.4.1)
@@ -300,7 +302,7 @@ GEM
     mime-types (1.25.1)
     modernizr-rails (2.7.1)
     mono_logger (1.1.0)
-    multi_json (1.13.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     net-scp (1.0.4)
@@ -460,7 +462,7 @@ GEM
       activerecord (>= 3.0.3)
       builder (>= 2.1.2)
       riddle (>= 1.5.3)
-    thor (0.19.1)
+    thor (0.20.3)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
@@ -512,7 +514,7 @@ DEPENDENCIES
   god!
   hashie (= 2.1.2)
   jquery-rails (= 3.1.0)
-  jquery-ui-rails (= 4.1.2)
+  jquery-ui-rails (= 6.0.0)
   json (= 1.8.3)
   jwt (= 1.4.1)
   mailboxer (= 0.10.3)