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 1.0.19 to 3.1.3 #104

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

Bump jquery-rails from 1.0.19 to 3.1.3 #104

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 @@ -9,7 +9,7 @@ gem 'pg', '0.13.2'
gem 'rails', '3.2.6'
gem 'thin', '1.3.1'
gem 'yajl-ruby', '1.1.0', :require => 'yajl'
gem "jquery-rails", "1.0.19"
gem "jquery-rails", "3.1.3"

group :assets do
gem 'sass-rails', "~> 3.2.5"
Expand Down
38 changes: 20 additions & 18 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ GEM
sass (>= 3.1)
bourne (1.1.1)
mocha (= 0.10.4)
builder (3.0.0)
builder (3.0.4)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand All @@ -58,6 +58,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.1)
concurrent-ruby (1.1.5)
cucumber (1.1.9)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
Expand Down Expand Up @@ -91,14 +92,15 @@ GEM
rails (~> 3.0)
gherkin (2.9.0)
json (>= 1.4.6)
hike (1.2.1)
hike (1.2.3)
htmldiff (0.0.1)
i18n (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
journey (1.0.4)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
json (1.7.3)
jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
launchy (2.0.5)
addressable (~> 2.2.6)
libwebsocket (0.1.3)
Expand All @@ -111,17 +113,17 @@ GEM
mime-types (1.19)
mocha (0.10.4)
metaclass (~> 0.0.1)
multi_json (1.3.6)
multi_json (1.14.0)
nokogiri (1.5.4)
open4 (1.3.0)
pg (0.13.2)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
rack (1.4.7)
rack-cache (1.9.0)
rack (>= 0.4)
rack-ssl (1.3.2)
rack-ssl (1.3.4)
rack
rack-test (0.6.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.6)
actionmailer (= 3.2.6)
Expand All @@ -138,8 +140,8 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rdoc (3.12)
rake (13.0.0)
rdoc (3.12.2)
json (~> 1.4)
rspec (2.8.0)
rspec-core (~> 2.8.0)
Expand Down Expand Up @@ -167,7 +169,7 @@ GEM
rubyzip
shoulda-matchers (1.0.0)
spork (0.9.0)
sprockets (2.1.3)
sprockets (2.1.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
Expand All @@ -176,8 +178,8 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.15.3)
tilt (1.3.3)
thor (0.20.3)
tilt (1.4.1)
timecop (0.3.5)
treetop (1.4.10)
polyglot
Expand Down Expand Up @@ -209,7 +211,7 @@ DEPENDENCIES
foreman (= 0.40.0)
formtastic (= 2.0.2)
htmldiff (= 0.0.1)
jquery-rails (= 1.0.19)
jquery-rails (= 3.1.3)
launchy (= 2.0.5)
pg (= 0.13.2)
rails (= 3.2.6)
Expand Down