Skip to content
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
35 changes: 18 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ GEM
arel (2.2.3)
awesome_print (1.0.2)
bcrypt-ruby (3.0.1)
builder (3.0.0)
builder (3.0.4)
cancan (1.6.7)
capybara (1.1.2)
mime-types (>= 1.16)
Expand All @@ -49,6 +49,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
concurrent-ruby (1.1.5)
cucumber (1.2.0)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
Expand Down Expand Up @@ -122,12 +123,13 @@ GEM
guard (>= 0.2.2)
uglifier
hashie (1.2.0)
hike (1.2.1)
i18n (0.6.0)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
json (1.7.3)
hike (1.2.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (2.2.0)
launchy (2.1.0)
addressable (~> 2.2.6)
libwebsocket (0.1.3)
Expand Down Expand Up @@ -169,17 +171,17 @@ GEM
mime-types
pg (0.13.2)
polyglot (0.3.3)
rack (1.3.6)
rack-cache (1.2)
rack (1.3.10)
rack-cache (1.9.0)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
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.1.5)
actionmailer (= 3.1.5)
Expand All @@ -198,14 +200,13 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
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)
json (~> 1.4)
rdoc (3.9.5)
rspec (2.10.0)
rspec-core (~> 2.10.0)
rspec-expectations (~> 2.10.0)
Expand Down Expand Up @@ -235,7 +236,7 @@ GEM
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
spork (1.0.0rc3)
sprockets (2.0.4)
sprockets (2.0.5)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
Expand All @@ -245,7 +246,7 @@ GEM
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.6)
tilt (1.3.3)
tilt (1.4.1)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
Expand Down Expand Up @@ -288,7 +289,7 @@ DEPENDENCIES
omniauth
omniauth-google
omniauth-openid
paperclip (~> 2.3)
paperclip
pg
rails (= 3.1.5)
rails-footnotes (>= 3.7)
Expand Down