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 @@ -37,7 +37,7 @@ group :production do
gem 'pg', '0.12.2'
end

gem 'jquery-rails', '2.0.0'
gem 'jquery-rails', '3.1.5'

# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
Expand Down
38 changes: 20 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ GEM
bootstrap-sass (2.0.0)
bootstrap-will_paginate (0.0.6)
will_paginate
builder (3.0.0)
builder (3.0.4)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand All @@ -53,6 +53,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
concurrent-ruby (1.2.2)
diff-lcs (1.1.3)
erubis (2.7.0)
execjs (1.4.0)
Expand All @@ -65,30 +66,31 @@ GEM
faker (1.0.1)
i18n (~> 0.4)
ffi (1.1.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.0)
railties (>= 3.2.0.beta, < 5.0)
thor (~> 0.14)
json (1.7.4)
jquery-rails (3.1.5)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
libwebsocket (0.1.5)
addressable
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.3.6)
multi_json (1.15.0)
nokogiri (1.5.5)
pg (0.12.2)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
rack (1.4.7)
rack-cache (1.13.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 @@ -105,8 +107,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.6)
rdoc (3.12.2)
json (~> 1.4)
rspec (2.10.0)
rspec-core (~> 2.10.0)
Expand All @@ -132,13 +134,13 @@ GEM
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
sprockets (2.1.3)
sprockets (2.1.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
thor (0.15.4)
tilt (1.3.3)
thor (1.2.1)
tilt (1.4.1)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
Expand All @@ -162,7 +164,7 @@ DEPENDENCIES
coffee-rails (~> 3.2.2)
factory_girl_rails (= 1.4.0)
faker (= 1.0.1)
jquery-rails (= 2.0.0)
jquery-rails (= 3.1.5)
pg (= 0.12.2)
rails (= 3.2.7)
rspec-rails (= 2.10.0)
Expand Down