diff --git a/admin/Gemfile b/admin/Gemfile index e79c7489d..87fcbbecc 100644 --- a/admin/Gemfile +++ b/admin/Gemfile @@ -38,7 +38,7 @@ gem 'carrierwave', '0.9.0' gem 'carrierwave_direct' gem 'uuidtools', '2.1.2' gem 'jquery-rails' # , '2.3.0' # pinned because jquery-ui-rails was split from jquery-rails, but activeadmin doesn't support this gem yet -gem 'jquery-ui-rails' +gem 'jquery-ui-rails', '4.2.1' gem 'rails3-jquery-autocomplete' gem 'activeadmin', '0.6.2' gem 'mime-types', '1.25' diff --git a/web/Gemfile b/web/Gemfile index 2c3a862e1..9d68e0e98 100644 --- a/web/Gemfile +++ b/web/Gemfile @@ -24,7 +24,7 @@ gem 'builder' gem 'rails', '~>3.2.11' gem 'railties', '~>3.2.11' gem 'jquery-rails' -gem 'jquery-ui-rails' +gem 'jquery-ui-rails', '4.2.1' gem 'bootstrap-sass', '2.0.4' gem 'bcrypt-ruby', '3.0.1' gem 'faker', '1.0.1' diff --git a/web/app/assets/javascripts/landing/landing.js b/web/app/assets/javascripts/landing/landing.js index acb8bc769..0a42a8499 100644 --- a/web/app/assets/javascripts/landing/landing.js +++ b/web/app/assets/javascripts/landing/landing.js @@ -1,6 +1,7 @@ //= require jquery //= require jquery.monkeypatch //= require jquery_ujs +//= require jquery.ui.draggable //= require jquery.queryparams //= require jquery.hoverIntent //= require jquery.cookie diff --git a/web/app/assets/javascripts/web/web.js b/web/app/assets/javascripts/web/web.js index 70e1b71d0..a97905224 100644 --- a/web/app/assets/javascripts/web/web.js +++ b/web/app/assets/javascripts/web/web.js @@ -1,6 +1,7 @@ //= require jquery //= require jquery.monkeypatch //= require jquery_ujs +//= require jquery.ui.draggable //= require jquery.queryparams //= require jquery.hoverIntent //= require jquery.cookie