Skip to content
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 @@ -34,4 +34,4 @@ group :assets do
gem 'zurb-foundation', '~> 3.0.1'
end

gem 'jquery-rails', '2.0.2'
gem 'jquery-rails', '3.1.3'
38 changes: 20 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ GEM
annotate (2.5.0)
rake
arel (3.0.2)
builder (3.0.0)
builder (3.0.4)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand All @@ -56,6 +56,7 @@ GEM
sass (~> 3.1)
compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14)
concurrent-ruby (1.1.5)
database_cleaner (0.8.0)
diff-lcs (1.1.3)
erubis (2.7.0)
Expand All @@ -76,13 +77,14 @@ GEM
spork (>= 0.8.4)
haml (3.1.6)
hashie (1.2.0)
hike (1.2.1)
i18n (0.6.0)
hike (1.2.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
journey (1.0.4)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.7.4)
jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -100,7 +102,7 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.3.6)
multi_json (1.14.1)
nokogiri (1.5.5)
oauth (0.4.6)
omniauth (1.1.0)
Expand All @@ -116,12 +118,12 @@ GEM
polyglot (0.3.3)
quiet_assets (1.0.1)
railties (~> 3.1)
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.7)
actionmailer (= 3.2.7)
Expand All @@ -138,13 +140,13 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rake (13.0.0)
rb-fchange (0.0.5)
ffi
rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
rdoc (3.12)
rdoc (3.12.2)
json (~> 1.4)
rspec (2.10.0)
rspec-core (~> 2.10.0)
Expand Down Expand Up @@ -177,12 +179,12 @@ GEM
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
spork (0.9.0)
sprockets (2.1.3)
sprockets (2.1.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.15.4)
tilt (1.3.3)
thor (0.20.3)
tilt (1.4.1)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
Expand Down Expand Up @@ -215,7 +217,7 @@ DEPENDENCIES
guard-rspec (= 1.2.1)
guard-spork (= 0.3.2)
haml (= 3.1.6)
jquery-rails (= 2.0.2)
jquery-rails (= 3.1.3)
kaminari
launchy (= 2.1.2)
omniauth-twitter
Expand Down