Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump jquery-ui-rails from 3.0.1 to 6.0.0 #102

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ gem 'coffee-rails', '~> 4.0.0'

# Use jquery as the JavaScript library
gem 'jquery-rails'
gem "jquery-ui-rails", '3.0.1' #loads jquery ui v 1.9.2
gem "jquery-ui-rails", '6.0.0' #loads jquery ui v 1.9.2
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
# gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
Expand Down
45 changes: 25 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ GEM
bcrypt (3.1.11)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.3)
builder (3.2.4)
capistrano (3.2.1)
i18n
rake (>= 10.0.0)
Expand All @@ -69,8 +69,10 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.2.0)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.6)
daemons (1.2.4)
debug_inspector (0.0.3)
devise (4.3.0)
Expand All @@ -96,36 +98,38 @@ GEM
hashdiff (0.3.4)
hashie (3.5.5)
hike (1.2.3)
i18n (0.8.4)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (3.0.1)
jquery-rails
railties (>= 3.1.0)
jquery-ui-rails (6.0.0)
railties (>= 3.2.16)
json (1.8.6)
jwt (1.5.6)
loofah (2.0.3)
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.6)
mime-types (>= 1.16, < 4)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.2.0)
minitest (5.10.2)
mini_portile2 (2.8.1)
minitest (5.17.0)
multi_json (1.12.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (4.1.0)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
nokogiri (1.14.0)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
oauth (0.5.3)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
Expand Down Expand Up @@ -173,7 +177,8 @@ GEM
pg (0.21.0)
proxies (0.2.1)
public_suffix (2.0.5)
rack (1.6.8)
racc (1.6.2)
rack (1.6.13)
rack-attack (3.0.0)
rack
rack-test (0.6.3)
Expand All @@ -189,20 +194,20 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.3)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
rails-deprecated_sanitizer (1.0.4)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
railties (4.2.3)
actionpack (= 4.2.3)
activesupport (= 4.2.3)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.0.0)
rake (13.0.6)
rdoc (4.3.0)
redis (3.3.3)
redis-activesupport (5.0.2)
Expand Down Expand Up @@ -254,10 +259,10 @@ GEM
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.19.4)
thor (1.2.1)
thread_safe (0.3.6)
tilt (1.4.1)
tzinfo (1.2.3)
tzinfo (1.2.10)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
Expand Down Expand Up @@ -294,7 +299,7 @@ DEPENDENCIES
georuby
jbuilder (~> 2.0)
jquery-rails
jquery-ui-rails (= 3.0.1)
jquery-ui-rails (= 6.0.0)
omniauth-facebook
omniauth-github
omniauth-google-oauth2
Expand Down