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.

Sign up for GitHub

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

Jump to bottom

Bump jquery-rails from 3.1.2 to 3.1.5 #38

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump jquery-rails from 3.1.2 to 3.1.5 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'rails', '4.1.5'
gem 'mocha', '~> 0.14', require: false

gem 'rack-cache', '~> 1.2'
gem 'jquery-rails', '~> 3.1.0'
gem 'jquery-rails', '~> 3.1.5'

# require: false so bcrypt is loaded only when has_secure_password is used.
# This is to avoid ActiveModel (and by extension the entire framework)
Expand Down
18 changes: 9 additions & 9 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ GEM
arel (5.0.1.20140414130214)
bcrypt (3.1.10)
benchmark-ips (2.2.0)
builder (3.2.2)
builder (3.2.4)
dalli (2.7.4)
diff-lcs (1.2.5)
erubis (2.7.0)
Expand All @@ -43,10 +43,10 @@ GEM
ffaker (2.0.0)
hike (1.2.3)
i18n (0.7.0)
jquery-rails (3.1.2)
jquery-rails (3.1.5)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
json (1.8.6)
kgio (2.9.3)
kindlerb (1.0.1)
mustache
Expand Down Expand Up @@ -78,7 +78,7 @@ GEM
pg (0.18.2)
polyglot (0.3.5)
racc (1.4.12)
rack (1.5.3)
rack (1.5.5)
rack-cache (1.2)
rack (>= 0.4)
rack-test (0.6.3)
Expand All @@ -99,7 +99,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
rake (10.4.2)
rake (13.0.6)
rdoc (4.2.0)
redcarpet (2.2.2)
rspec-collection_matchers (1.1.2)
Expand Down Expand Up @@ -136,13 +136,13 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
thor (0.19.1)
thread_safe (0.3.5)
thor (1.2.1)
thread_safe (0.3.6)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (1.2.2)
tzinfo (1.2.11)
thread_safe (~> 0.1)
uglifier (2.7.1)
execjs (>= 0.3.0)
Expand All @@ -166,7 +166,7 @@ DEPENDENCIES
dalli (>= 2.2.1)
factory_girl_rails
ffaker
jquery-rails (~> 3.1.0)
jquery-rails (~> 3.1.5)
kindlerb
minitest (< 5.3.4)
mocha (~> 0.14)
Expand Down