* pin jquery-ui-rails to 4.2.1

This commit is contained in:
Seth Call 2014-07-03 20:39:26 -05:00
parent 3f53cb9819
commit 5b8fd14088
4 changed files with 4 additions and 2 deletions

View File

@ -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'

View File

@ -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'

View File

@ -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

View File

@ -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