Browse Source

use mongrel in dev, deps update

pull/1/head
Nicolae Claudius 13 years ago
parent
commit
b4466c4367
  1. 2
      Gemfile
  2. 74
      Gemfile.lock

2
Gemfile

@ -35,6 +35,8 @@ gem 'jquery-rails'
gem 'dalli', '~> 1.1.3' gem 'dalli', '~> 1.1.3'
# gem 'foreigner' ? # gem 'foreigner' ?
gem 'mongrel', '>= 1.2.0.pre2', :group => :development
group :test, :development do group :test, :development do
gem 'rspec-rails', '~> 2.6.1' gem 'rspec-rails', '~> 2.6.1'
gem 'faker','~> 1.0.1' gem 'faker','~> 1.0.1'

74
Gemfile.lock

@ -6,9 +6,9 @@ GIT
GIT GIT
remote: https://github.com/activescaffold/active_scaffold.git remote: https://github.com/activescaffold/active_scaffold.git
revision: 082cf10d1b88c3f2d208480e9841d0468cb8b47f revision: 75abf52219da6015e76a9bd9115f80134a384d69
specs: specs:
active_scaffold (3.1.5) active_scaffold (3.1.11)
rails (~> 3.1.0) rails (~> 3.1.0)
GEM GEM
@ -55,14 +55,14 @@ GEM
net-sftp (>= 2.0.0) net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14) net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0) net-ssh-gateway (>= 1.1.0)
capybara (1.1.1) capybara (1.1.2)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0) selenium-webdriver (~> 2.0)
xpath (~> 0.1.4) xpath (~> 0.1.4)
childprocess (0.2.2) childprocess (0.2.3)
ffi (~> 1.0.6) ffi (~> 1.0.6)
chunky_png (1.2.5) chunky_png (1.2.5)
coffee-rails (3.1.1) coffee-rails (3.1.1)
@ -71,14 +71,15 @@ GEM
coffee-script (2.2.0) coffee-script (2.2.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.1.2) coffee-script-source (1.1.3)
compass (0.12.alpha.0) compass (0.12.alpha.2)
chunky_png (~> 1.2) chunky_png (~> 1.2)
fssm (>= 0.2.7) fssm (>= 0.2.7)
sass (~> 3.1) sass (~> 3.1)
daemons (1.0.10)
dalli (1.1.3) dalli (1.1.3)
database_cleaner (0.6.7) database_cleaner (0.6.7)
devise (1.4.8) devise (1.4.9)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3) orm_adapter (~> 0.0.3)
warden (~> 1.0.3) warden (~> 1.0.3)
@ -86,39 +87,42 @@ GEM
erubis (2.7.0) erubis (2.7.0)
execjs (1.2.9) execjs (1.2.9)
multi_json (~> 1.0) multi_json (~> 1.0)
factory_girl (2.2.0) factory_girl (2.3.2)
activesupport activesupport
factory_girl_rails (1.3.0) factory_girl_rails (1.4.0)
factory_girl (~> 2.2.0) factory_girl (~> 2.3.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faker (1.0.1) faker (1.0.1)
i18n (~> 0.4) i18n (~> 0.4)
ffi (1.0.9) ffi (1.0.11)
fssm (0.2.7) fssm (0.2.7)
guard (0.8.7) gem_plugin (0.2.3)
guard (0.8.8)
thor (~> 0.14.6) thor (~> 0.14.6)
guard-rspec (0.4.5) guard-rspec (0.4.5)
guard (>= 0.4.0) guard (>= 0.4.0)
guard-spork (0.3.1) guard-spork (0.3.2)
guard (>= 0.8.4) guard (>= 0.8.4)
spork (>= 0.8.4) spork (>= 0.8.4)
highline (1.6.2) highline (1.6.8)
hike (1.2.1) hike (1.2.1)
i18n (0.6.0) i18n (0.6.0)
jquery-rails (1.0.16) jquery-rails (1.0.19)
railties (~> 3.0) railties (~> 3.0)
thor (~> 0.14) thor (~> 0.14)
json (1.6.1) json (1.6.2)
json_pure (1.6.1) libv8 (3.3.10.4)
libv8 (3.3.10.2)
mail (2.3.0) mail (2.3.0)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
mail_form (1.3.0) mail_form (1.3.0)
mime-types (1.16) mime-types (1.17.2)
multi_json (1.0.3) mongrel (1.2.0.pre2)
mysql2 (0.3.7) daemons (~> 1.0.10)
gem_plugin (~> 0.2.3)
multi_json (1.0.4)
mysql2 (0.3.10)
net-scp (1.0.4) net-scp (1.0.4)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
net-sftp (2.0.5) net-sftp (2.0.5)
@ -133,7 +137,7 @@ GEM
orm_adapter (0.0.5) orm_adapter (0.0.5)
pjax_rails (0.1.10) pjax_rails (0.1.10)
jquery-rails jquery-rails
polyglot (0.3.2) polyglot (0.3.3)
rack (1.3.5) rack (1.3.5)
rack-cache (1.1) rack-cache (1.1)
rack (>= 0.4) rack (>= 0.4)
@ -151,7 +155,7 @@ GEM
activesupport (= 3.1.1) activesupport (= 3.1.1)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.1.1) railties (= 3.1.1)
rails_config (0.2.4) rails_config (0.2.5)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (3.1.1) railties (3.1.1)
actionpack (= 3.1.1) actionpack (= 3.1.1)
@ -160,7 +164,7 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (~> 0.14.6) thor (~> 0.14.6)
rake (0.9.2) rake (0.9.2.2)
rb-fsevent (0.4.3.1) rb-fsevent (0.4.3.1)
rdoc (3.11) rdoc (3.11)
json (~> 1.4) json (~> 1.4)
@ -177,18 +181,17 @@ GEM
activesupport (~> 3.0) activesupport (~> 3.0)
railties (~> 3.0) railties (~> 3.0)
rspec (~> 2.6.0) rspec (~> 2.6.0)
rubyzip (0.9.4) rubyzip (0.9.5)
sass (3.1.10) sass (3.1.11)
sass-rails (3.1.4) sass-rails (3.1.5)
actionpack (~> 3.1.0) actionpack (~> 3.1.0)
railties (~> 3.1.0) railties (~> 3.1.0)
sass (>= 3.1.4) sass (~> 3.1.10)
sprockets (~> 2.0.0)
tilt (~> 1.3.2) tilt (~> 1.3.2)
selenium-webdriver (2.8.0) selenium-webdriver (2.14.0)
childprocess (>= 0.2.1) childprocess (>= 0.2.1)
ffi (>= 1.0.7) ffi (~> 1.0.9)
json_pure multi_json (~> 1.0.4)
rubyzip rubyzip
sentient_user (0.3.2) sentient_user (0.3.2)
spork (0.9.0.rc9) spork (0.9.0.rc9)
@ -196,15 +199,15 @@ GEM
hike (~> 1.2) hike (~> 1.2)
rack (~> 1.0) rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1) tilt (!= 1.3.0, ~> 1.1)
therubyracer (0.9.8) therubyracer (0.9.9)
libv8 (~> 3.3.10) libv8 (~> 3.3.10)
thor (0.14.6) thor (0.14.6)
tilt (1.3.3) tilt (1.3.3)
treetop (1.4.10) treetop (1.4.10)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.30) tzinfo (0.3.31)
uglifier (1.0.4) uglifier (1.1.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (>= 1.0.2) multi_json (>= 1.0.2)
warden (1.0.6) warden (1.0.6)
@ -232,6 +235,7 @@ DEPENDENCIES
guard-spork (~> 0.3.0) guard-spork (~> 0.3.0)
jquery-rails jquery-rails
mail_form (~> 1.3.0) mail_form (~> 1.3.0)
mongrel (>= 1.2.0.pre2)
mysql2 mysql2
nilify_blanks (~> 1.0.0) nilify_blanks (~> 1.0.0)
pjax_rails (~> 0.1.10) pjax_rails (~> 0.1.10)

Loading…
Cancel
Save