This commit is contained in:
Nico 2013-02-13 01:00:43 +01:00
parent fa51b4ff01
commit 68cf7b6675
2 changed files with 44 additions and 35 deletions

View File

@ -1,31 +1,31 @@
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (3.2.0) actionmailer (3.2.11)
actionpack (= 3.2.0) actionpack (= 3.2.11)
mail (~> 2.4.0) mail (~> 2.4.4)
actionpack (3.2.0) actionpack (3.2.11)
activemodel (= 3.2.0) activemodel (= 3.2.11)
activesupport (= 3.2.0) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
journey (~> 1.0.0) journey (~> 1.0.4)
rack (~> 1.4.0) rack (~> 1.4.0)
rack-cache (~> 1.1) rack-cache (~> 1.2)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.1.2) sprockets (~> 2.2.1)
activemodel (3.2.0) activemodel (3.2.11)
activesupport (= 3.2.0) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
activerecord (3.2.0) activerecord (3.2.11)
activemodel (= 3.2.0) activemodel (= 3.2.11)
activesupport (= 3.2.0) activesupport (= 3.2.11)
arel (~> 3.0.0) arel (~> 3.0.2)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activeresource (3.2.0) activeresource (3.2.11)
activemodel (= 3.2.0) activemodel (= 3.2.11)
activesupport (= 3.2.0) activesupport (= 3.2.11)
activesupport (3.2.0) activesupport (3.2.11)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
acts_as_commentable (4.0.0) acts_as_commentable (4.0.0)
@ -83,6 +83,7 @@ GEM
kaminari (0.14.1) kaminari (0.14.1)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
kgio (2.8.0)
mail (2.4.4) mail (2.4.4)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
@ -92,7 +93,7 @@ GEM
compass (>= 0.12.1) compass (>= 0.12.1)
sass (>= 3.2.0) sass (>= 3.2.0)
sassy-math (>= 1.5) sassy-math (>= 1.5)
multi_json (1.5.1) multi_json (1.6.0)
mysql2 (0.3.11) mysql2 (0.3.11)
net-scp (1.1.0) net-scp (1.1.0)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
@ -110,21 +111,22 @@ GEM
rack rack
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (3.2.0) rails (3.2.11)
actionmailer (= 3.2.0) actionmailer (= 3.2.11)
actionpack (= 3.2.0) actionpack (= 3.2.11)
activerecord (= 3.2.0) activerecord (= 3.2.11)
activeresource (= 3.2.0) activeresource (= 3.2.11)
activesupport (= 3.2.0) activesupport (= 3.2.11)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.2.0) railties (= 3.2.11)
railties (3.2.0) railties (3.2.11)
actionpack (= 3.2.0) actionpack (= 3.2.11)
activesupport (= 3.2.0) activesupport (= 3.2.11)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (~> 0.14.6) thor (>= 0.14.6, < 2.0)
raindrops (0.10.0)
rake (10.0.3) rake (10.0.3)
rdoc (3.12.1) rdoc (3.12.1)
json (~> 1.4) json (~> 1.4)
@ -138,11 +140,12 @@ GEM
tilt (~> 1.3) tilt (~> 1.3)
sassy-math (1.5) sassy-math (1.5)
compass (~> 0.11) compass (~> 0.11)
sprockets (2.1.3) sprockets (2.2.2)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
thor (0.14.6) thor (0.17.0)
tilt (1.3.3) tilt (1.3.3)
treetop (1.4.12) treetop (1.4.12)
polyglot polyglot
@ -153,6 +156,10 @@ GEM
uglifier (1.3.0) uglifier (1.3.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2) multi_json (~> 1.0, >= 1.0.2)
unicorn (4.6.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
warden (1.2.1) warden (1.2.1)
rack (>= 1.0) rack (>= 1.0)
zurb-foundation (3.2.5) zurb-foundation (3.2.5)
@ -167,6 +174,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
acts_as_commentable acts_as_commentable
acts_as_tree acts_as_tree
bcrypt-ruby (~> 3.0.0)
capistrano capistrano
carrierwave carrierwave
coffee-rails (~> 3.2.1) coffee-rails (~> 3.2.1)
@ -179,10 +187,11 @@ DEPENDENCIES
jquery-rails jquery-rails
kaminari kaminari
mysql2 mysql2
rails (= 3.2.0) rails (= 3.2.11)
rmagick rmagick
rvm-capistrano rvm-capistrano
sass-rails (~> 3.2.3) sass-rails (~> 3.2.3)
turn (= 0.8.2) turn (= 0.8.2)
uglifier (>= 1.0.3) uglifier (>= 1.0.3)
unicorn
zurb-foundation (>= 3.2) zurb-foundation (>= 3.2)

View File

@ -29,7 +29,7 @@ set :application, 'ecole_eft_app'
role :db, domain, :primary => true role :db, domain, :primary => true
set :scm, :git set :scm, :git
set :repository, "git@gitlab.bally.me:root/ecole_eft.git" set :repository, "git@gitlab.bally.me:root/ecole-eft.git"
set :branch, "master" set :branch, "master"
default_run_options[:pty] = true default_run_options[:pty] = true