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
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

gem 'rails', '3.2.7'
gem 'jquery-rails', '2.0.0'
gem 'jquery-rails', '3.1.5'
gem 'bootstrap-sass', '2.0.0'
gem 'bcrypt-ruby', '3.0.1'
gem 'faker', '1.0.1'
Expand Down
39 changes: 20 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 @@ -51,6 +51,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
concurrent-ruby (1.2.2)
cucumber (1.2.1)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
Expand Down Expand Up @@ -83,13 +84,14 @@ GEM
guard-spork (0.3.2)
guard (>= 0.8.4)
spork (>= 0.8.4)
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 (2.6.3)
launchy (2.1.0)
addressable (~> 2.2.6)
libwebsocket (0.1.5)
Expand All @@ -103,16 +105,16 @@ GEM
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 @@ -129,14 +131,13 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rake (13.0.6)
rb-fchange (0.0.5)
ffi
rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
rdoc (3.12)
json (~> 1.4)
rdoc (3.9.5)
rspec (2.10.0)
rspec-core (~> 2.10.0)
rspec-expectations (~> 2.10.0)
Expand All @@ -162,13 +163,13 @@ GEM
multi_json (~> 1.0)
rubyzip
spork (0.9.0)
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 @@ -195,7 +196,7 @@ DEPENDENCIES
faker (= 1.0.1)
guard-rspec (= 0.5.5)
guard-spork (= 0.3.2)
jquery-rails (= 2.0.0)
jquery-rails (= 3.1.5)
launchy (= 2.1.0)
pg (= 0.12.2)
rails (= 3.2.7)
Expand Down