Skip to content
This repository was archived by the owner on Sep 23, 2020. It is now read-only.
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 server/Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.0.19'
gem 'rails', '3.2.17'

gem 'jquery-rails'
gem "simple_form"
Expand Down
125 changes: 67 additions & 58 deletions server/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
actionmailer (3.0.19)
actionpack (= 3.0.19)
mail (~> 2.2.19)
actionpack (3.0.19)
activemodel (= 3.0.19)
activesupport (= 3.0.19)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
rack (~> 1.2.5)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
activemodel (3.0.19)
activesupport (= 3.0.19)
builder (~> 2.1.2)
i18n (~> 0.5.0)
activerecord (3.0.19)
activemodel (= 3.0.19)
activesupport (= 3.0.19)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
activeresource (3.0.19)
activemodel (= 3.0.19)
activesupport (= 3.0.19)
activesupport (3.0.19)
actionmailer (3.2.17)
actionpack (= 3.2.17)
mail (~> 2.5.4)
actionpack (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
activerecord (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
activesupport (3.2.17)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
acts_as_list (0.1.9)
addressable (2.3.2)
arel (2.0.10)
arel (3.0.3)
authlogic (3.2.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
builder (2.1.2)
builder (3.0.4)
capybara (2.0.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand All @@ -46,6 +46,7 @@ GEM
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
columnize (0.3.6)
concurrent-ruby (1.1.5)
cucumber (1.2.1)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
Expand All @@ -59,17 +60,19 @@ GEM
database_cleaner (0.9.1)
declarative_authorization (0.5.6)
diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
erubis (2.7.0)
fastthread (1.0.7)
ffi (1.3.1)
gem_plugin (0.2.3)
gherkin (2.11.5)
json (>= 1.4.6)
hike (1.2.3)
httparty (0.10.0)
multi_json (~> 1.0)
multi_xml
i18n (0.5.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
journey (1.0.4)
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
Expand All @@ -79,12 +82,10 @@ GEM
websocket
linecache (0.46)
rbx-require-relative (> 0.0.4)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mail (2.5.5)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
mime-types (1.25.1)
mongrel (1.1.5)
cgi_multipart_eof_fix (>= 2.4)
daemons (>= 1.0.3)
Expand All @@ -94,30 +95,33 @@ GEM
multi_xml (0.5.2)
nokogiri (1.5.6)
pg (0.14.1)
polyglot (0.3.3)
polyglot (0.3.5)
puavo-client (0.0.4)
rack (1.2.6)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
rack (1.4.7)
rack-cache (1.9.0)
rack (>= 0.4)
rack-ssl (1.3.4)
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (3.0.19)
actionmailer (= 3.0.19)
actionpack (= 3.0.19)
activerecord (= 3.0.19)
activeresource (= 3.0.19)
activesupport (= 3.0.19)
rails (3.2.17)
actionmailer (= 3.2.17)
actionpack (= 3.2.17)
activerecord (= 3.2.17)
activeresource (= 3.2.17)
activesupport (= 3.2.17)
bundler (~> 1.0)
railties (= 3.0.19)
railties (3.0.19)
actionpack (= 3.0.19)
activesupport (= 3.0.19)
railties (= 3.2.17)
railties (3.2.17)
actionpack (= 3.2.17)
activesupport (= 3.2.17)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (10.0.3)
thor (>= 0.14.6, < 2.0)
rake (13.0.0)
rbx-require-relative (0.0.9)
rdoc (3.12)
rdoc (3.12.2)
json (~> 1.4)
responders (0.6.5)
rmagick (2.13.1)
Expand Down Expand Up @@ -150,16 +154,21 @@ GEM
sinatra (1.2.8)
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
thor (0.14.6)
thor (0.20.3)
tilt (1.3.3)
tiny_mce (0.1.8)
treetop (1.4.12)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.35)
tzinfo (0.3.55)
websocket (1.0.6)
xpath (1.0.0)
nokogiri (~> 1.3)
Expand All @@ -181,7 +190,7 @@ DEPENDENCIES
mongrel
pg
puavo-client
rails (= 3.0.19)
rails (= 3.2.17)
responders
rmagick
rspec-rails
Expand Down