diff --git a/Gemfile b/Gemfile index 4a82c7c..00165da 100644 --- a/Gemfile +++ b/Gemfile @@ -17,8 +17,8 @@ gem 'bcrypt-ruby' # https://github.com/ryanb/cancan gem 'cancan' -# Deploy with Capistrano -gem 'capistrano' +# Deploy with Mina - http://nadarei.co/mina/ +gem 'mina' # For avatar images: https://github.com/jnicklas/carrierwave gem 'carrierwave' diff --git a/Gemfile.lock b/Gemfile.lock index 76f4b2d..e906fe7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,10 +35,6 @@ GEM thor builder (3.1.4) cancan (1.6.10) - capistrano (3.0.1) - i18n - rake (>= 10.0.0) - sshkit (>= 0.0.23) carrierwave (0.9.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) @@ -68,11 +64,12 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25) + mina (0.3.0) + open4 + rake minitest (4.7.5) multi_json (1.8.2) - net-scp (1.1.2) - net-ssh (>= 2.6.5) - net-ssh (2.7.0) + open4 (1.3.0) orm_adapter (0.4.0) pg (0.17.0) polyglot (0.3.3) @@ -107,17 +104,10 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - sshkit (1.1.0) - net-scp - net-ssh - term-ansicolor - term-ansicolor (1.2.2) - tins (~> 0.8) thor (0.18.1) thread_safe (0.1.3) atomic tilt (1.4.1) - tins (0.12.0) treetop (1.4.15) polyglot polyglot (>= 0.3.1) @@ -136,12 +126,12 @@ DEPENDENCIES bootstrap-sass (~> 3.0.0.0) bourbon cancan - capistrano carrierwave coffee-rails devise jquery-rails mail + mina pg rails (= 4.0.1) sass-rails