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-rails from 4.3.1 to 4.6.0 #14

Open
wants to merge 1 commit into
base: 4-2-backport-29834
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 @@ -18,7 +18,7 @@ gem 'rake', '>= 10.3', '< 12.3'
gem 'mocha', '~> 0.14', require: false

gem 'rack-cache', '~> 1.2'
gem 'jquery-rails', '~> 4.0'
gem 'jquery-rails', '~> 4.6'
gem 'coffee-rails', '~> 4.1.0'

if RUBY_VERSION < "2.1"
Expand Down
22 changes: 11 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ GEM
bcrypt (3.1.11-x86-mingw32)
beaneater (1.0.0)
benchmark-ips (2.7.2)
builder (3.2.3)
builder (3.2.4)
bunny (2.0.0)
amq-protocol (>= 1.9.2)
celluloid (0.17.3)
Expand Down Expand Up @@ -108,7 +108,7 @@ GEM
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
connection_pool (2.2.1)
crass (1.0.4)
crass (1.0.6)
dalli (2.7.6)
dante (0.2.0)
delayed_job (4.1.4)
Expand All @@ -126,15 +126,15 @@ GEM
hitimes (1.2.6-x86-mingw32)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jquery-rails (4.3.1)
jquery-rails (4.6.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
kindlerb (0.1.1)
mustache
nokogiri
loofah (2.2.3)
loofah (2.21.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand Down Expand Up @@ -163,21 +163,21 @@ GEM
queue_classic (3.1.0)
pg (>= 0.17, < 0.19)
racc (1.4.14)
rack (1.6.9)
rack (1.6.13)
rack-cache (1.7.1)
rack (>= 0.4)
rack-protection (1.5.5)
rack
rack-test (0.6.3)
rack (>= 1.0)
rails-deprecated_sanitizer (1.0.3)
rails-deprecated_sanitizer (1.0.4)
activesupport (>= 4.2.0.alpha)
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.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
rake (12.2.1)
rdoc (4.3.0)
redcarpet (3.1.2)
Expand Down Expand Up @@ -229,7 +229,7 @@ GEM
stackprof (0.2.11)
sucker_punch (1.6.0)
celluloid (~> 0.17.2)
thor (0.20.0)
thor (1.2.2)
thread (0.1.7)
thread_safe (0.3.6)
tilt (2.0.8)
Expand All @@ -238,7 +238,7 @@ GEM
turbolinks (5.1.0)
turbolinks-source (~> 5.1)
turbolinks-source (5.1.0)
tzinfo (1.2.10)
tzinfo (1.2.11)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
Expand Down Expand Up @@ -266,7 +266,7 @@ DEPENDENCIES
delayed_job
delayed_job_active_record
execjs (< 2.5)
jquery-rails (~> 4.0)
jquery-rails (~> 4.6)
kindlerb (= 0.1.1)
mime-types (< 3)
minitest (< 5.3.4)
Expand Down