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 3.0.4 to 3.1.5 #226

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
63 changes: 34 additions & 29 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ PATH
specs:
reimagine2 (2.0.55)
coffee-rails
compass-rails
rails
sass-rails
zurb-foundation (~> 4)
Expand Down Expand Up @@ -50,41 +49,40 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
chunky_png (1.3.1)
coderay (1.0.9)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.7.0)
coffee-script-source (1.12.2)
columnize (0.9.0)
compass (0.12.6)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.2.19)
compass-rails (1.1.7)
compass (>= 0.12.2)
sprockets (<= 2.11.0)
concurrent-ruby (1.2.2)
daemons (1.1.9)
debugger (1.6.8)
columnize (>= 0.3.1)
debugger-linecache (~> 1.2.0)
debugger-ruby_core_source (~> 1.3.5)
debugger-linecache (1.2.0)
debugger-ruby_core_source (1.3.8)
diff-lcs (1.2.4)
dotenv (0.9.0)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.1.0)
execjs (2.8.1)
ffi (1.15.5)
foreman (0.63.0)
dotenv (>= 0.7)
thor (>= 0.13.6)
fssm (0.2.10)
hike (1.2.3)
i18n (0.6.5)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
journey (1.0.4)
jquery-rails (3.0.4)
jquery-rails (3.1.5)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
json (1.8.6)
launchy (2.3.0)
addressable (~> 2.3)
mail (2.5.4)
Expand All @@ -93,7 +91,7 @@ GEM
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.5.1)
multi_json (1.8.2)
multi_json (1.15.0)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
polyglot (0.3.3)
Expand All @@ -104,15 +102,15 @@ GEM
pry-byebug (1.3.2)
byebug (~> 2.7)
pry (~> 0.9.12)
pry-remote (0.1.8)
pry (~> 0.9)
slop (~> 3.0)
rack (1.4.5)
rack-cache (1.2)
pry-debugger (0.2.3)
debugger (~> 1.3)
pry (>= 0.9.10, < 0.11.0)
rack (1.4.7)
rack-cache (1.13.0)
rack (>= 0.4)
rack-ssl (1.3.3)
rack-ssl (1.3.4)
rack
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.15)
actionmailer (= 3.2.15)
Expand All @@ -129,7 +127,10 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.1.0)
rake (13.0.6)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (3.12.2)
json (~> 1.4)
rspec-core (2.14.4)
Expand All @@ -143,13 +144,17 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
sass (3.2.19)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
slop (3.4.6)
sprockets (2.2.2)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand All @@ -161,7 +166,7 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.18.1)
thor (1.2.1)
tilt (1.4.1)
treetop (1.4.15)
polyglot
Expand All @@ -181,7 +186,7 @@ DEPENDENCIES
launchy
pry
pry-byebug
pry-remote
pry-debugger
rails (~> 3.2)
reimagine2!
rspec-rails (~> 2.0)
Expand Down