[dist] update gem versions

This brings jquery-ui-rails, jquery-rails is no longer a catch all

src/api/Gemfile

@@ -10,7 +10,7 @@ gem 'actionmailer'
 
 gem 'mysql2'
 gem 'daemons'
-gem 'nokogiri', '~>1.5.0'
+gem 'nokogiri', '~>1.6.0'
 gem 'delayed_job', '>3.0'
 gem 'delayed_job_active_record'
 gem 'hoptoad_notifier', "~> 2.3"
@@ -20,7 +20,7 @@ gem 'ruby-ldap', :require => false
 gem 'dalli', :require => false
 
 group :test do
-  gem 'database_cleaner'
+  gem 'database_cleaner', '>= 1.0.1'
   gem 'ci_reporter'
   gem 'simplecov-rcov', :require => false
   gem 'minitest', '< 5.0'

src/api/Gemfile.lock

@@ -31,9 +31,10 @@ GEM
     ci_reporter (1.8.4)
       builder (>= 2.1.2)
     coderay (1.0.9)
-    crack (0.3.2)
+    crack (0.4.0)
+      safe_yaml (~> 0.9.0)
     daemons (1.1.9)
-    dalli (2.6.3)
+    dalli (2.6.4)
     database_cleaner (1.0.1)
     delayed_job (3.0.5)
       activesupport (~> 3.0)
@@ -43,7 +44,7 @@ GEM
     erubis (2.7.0)
     faker (1.1.2)
       i18n (~> 0.5)
-    hike (1.2.2)
+    hike (1.2.3)
     hoptoad_notifier (2.4.11)
       activesupport
       builder
@@ -55,12 +56,14 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.1)
     mime-types (1.23)
+    mini_portile (0.5.0)
     minitest (4.7.4)
     minitest-colorize (0.0.5)
       minitest (>= 2.0)
-    multi_json (1.7.3)
+    multi_json (1.7.7)
     mysql2 (0.3.11)
-    nokogiri (1.5.9)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     pkg-config (1.1.4)
     polyglot (0.3.3)
     pry (0.9.12.2)
@@ -85,10 +88,11 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
+    rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    ruby-ldap (0.9.12)
+    ruby-ldap (0.9.13)
+    safe_yaml (0.9.3)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -104,7 +108,7 @@ GEM
     thor (0.18.1)
     tilt (1.4.1)
     timecop (0.6.1)
-    treetop (1.4.12)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
@@ -123,7 +127,7 @@ DEPENDENCIES
   ci_reporter
   daemons
   dalli
-  database_cleaner
+  database_cleaner (>= 1.0.1)
   delayed_job (> 3.0)
   delayed_job_active_record
   faker
@@ -132,7 +136,7 @@ DEPENDENCIES
   minitest (< 5.0)
   minitest-colorize
   mysql2
-  nokogiri (~> 1.5.0)
+  nokogiri (~> 1.6.0)
   pry (>= 0.9.12)
   rails-api
   rdoc

src/webui/Gemfile

@@ -45,7 +45,7 @@ group :test do
 end
 
 gem 'mysql2'
-gem 'nokogiri', '~>1.5.0'
+gem 'nokogiri', '~>1.6.0'
 gem 'delayed_job', '>3.0'
 gem 'delayed_job_active_record'
 gem 'hoptoad_notifier', "~> 2.3"
@@ -54,4 +54,5 @@ gem 'rdoc'
 gem 'xmlhash', '>=1.3.2'
 gem 'dalli', :require => false
 gem 'jquery-rails'
+gem 'jquery-ui-rails'
 gem 'mobileesp_converted'

src/webui/Gemfile.lock

@@ -49,11 +49,11 @@ GEM
     chunky_png (1.2.8)
     ci_reporter (1.8.4)
       builder (>= 2.1.2)
-    codemirror-rails (3.12)
-      railties (~> 3.0)
+    codemirror-rails (3.13)
+      railties (>= 3.0, < 5)
     coderay (1.0.9)
     cssmin (1.0.3)
-    dalli (2.6.3)
+    dalli (2.6.4)
     delayed_job (3.0.5)
       activesupport (~> 3.0)
     delayed_job_active_record (0.4.4)
@@ -64,19 +64,22 @@ GEM
       multi_json (~> 1.0)
     faker (1.1.2)
       i18n (~> 0.5)
-    ffi (1.8.1)
+    ffi (1.9.0)
     headless (1.0.1)
-    hike (1.2.2)
+    hike (1.2.3)
     hoptoad_notifier (2.4.11)
       activesupport
       builder
     i18n (0.6.1)
     journey (1.0.4)
     jquery-datatables-rails (1.11.2)
       jquery-rails
-    jquery-rails (2.2.1)
+    jquery-rails (3.0.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    jquery-ui-rails (4.0.3)
+      jquery-rails
+      railties (>= 3.1.0)
     json (1.8.0)
     launchy (2.3.0)
       addressable (~> 2.3)
@@ -86,15 +89,17 @@ GEM
     metaclass (0.0.1)
     method_source (0.8.1)
     mime-types (1.23)
+    mini_portile (0.5.0)
     minitest (4.7.4)
     minitest-colorize (0.0.5)
       minitest (>= 2.0)
     mobileesp_converted (0.2.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.3)
+    multi_json (1.7.7)
     mysql2 (0.3.11)
-    nokogiri (1.5.9)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     pkg-config (1.1.4)
     polyglot (0.3.3)
     pry (0.9.12.2)
@@ -125,7 +130,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
+    rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rubyzip (0.9.9)
@@ -134,7 +139,7 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.32.1)
+    selenium-webdriver (2.33.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip
@@ -155,7 +160,7 @@ GEM
     sqlite3 (1.3.7)
     thor (0.18.1)
     tilt (1.4.1)
-    treetop (1.4.12)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
@@ -188,14 +193,15 @@ DEPENDENCIES
   i18n (= 0.6.1)
   jquery-datatables-rails
   jquery-rails
+  jquery-ui-rails
   json
   launchy
   minitest (< 5.0)
   minitest-colorize
   mobileesp_converted
   mocha (> 0.13.0)
   mysql2
-  nokogiri (~> 1.5.0)
+  nokogiri (~> 1.6.0)
   pry (>= 0.9.12)
   rails (~> 3.2.9)
   rails_tokeninput (>= 1.6.1.rc1)

src/webui/app/assets/javascripts/application.js

@@ -11,7 +11,8 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
-//= require jquery-ui
+//= require jquery.ui.menu
+//= require jquery.ui.autocomplete
 //= require jquery_ujs
 //
 //= require jquery.expander.js

src/webui/app/assets/stylesheets/application.scss

@@ -11,6 +11,8 @@
  *= require dataTables/jquery.dataTables
  *= require token-input
  *= require token-input-facebook
+ *= require jquery.ui.menu
+ *= require jquery.ui.autocomplete
 */
 @import "bento/reset";
 @import "bento/960";