Skip to content

Commit

Permalink
Upgrading jquery-ui-rails
Browse files Browse the repository at this point in the history
Nothing specific about this one but good for upgrading jquery-rails when
issue #114 is done.
  • Loading branch information
Hugo Corbucci committed Dec 19, 2014
1 parent cb76cfb commit 1d7c95b
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ group :assets do
gem 'therubyracer', '0.12.1'
gem 'sass-rails', '3.2.6' # 4.0.1 for rails 4 (issue #114)
gem 'yui-compressor', '0.12.0'
gem 'jquery-ui-rails', '4.2.1'
gem 'jquery-ui-rails', '5.0.3'
gem 'coffee-rails', '3.2.2' # 4.0.1 for rails 4 (issue #114)
gem 'fancybox-rails', '0.2.1'
gem 'uglifier', '2.6.0'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ GEM
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.2.1)
jquery-ui-rails (5.0.3)
railties (>= 3.2.16)
json (1.8.1)
konacha (3.3.0)
Expand Down Expand Up @@ -386,7 +386,7 @@ DEPENDENCIES
has_scope (= 0.6.0.rc)
inherited_resources (= 1.5.1)
jquery-rails (= 3.1.2)
jquery-ui-rails (= 4.2.1)
jquery-ui-rails (= 5.0.3)
konacha
lol_dba
magic-localized_country_select (= 0.2.0)
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/application.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
@import "mixins/*";
@import "formtastic_changes";
@import "jquery.ui.autocomplete_changes";
@import "jquery-ui/autocomplete_changes";

$color1: #009933;
$color2: #5ad295;
Expand Down
2 changes: 1 addition & 1 deletion vendor/assets/javascripts/vendor_libs.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*=require jquery
*=require jquery_ujs
*=require jquery.ui.autocomplete
*=require jquery-ui/autocomplete
*
*=require charCount
*=require jquery.placeholder
Expand Down
Binary file removed vendor/cache/jquery-ui-rails-4.2.1.gem
Binary file not shown.
Binary file added vendor/cache/jquery-ui-rails-5.0.3.gem
Binary file not shown.

0 comments on commit 1d7c95b

Please sign in to comment.