diff options
| author | Luc Donnet | 2015-03-11 09:46:11 +0100 |
|---|---|---|
| committer | Luc Donnet | 2015-03-11 09:46:11 +0100 |
| commit | bfab1e4947c66f4232efd604cb952b95e43ad623 (patch) | |
| tree | a9cdffb3a07b2e2ebd02ee8f0fd56a56a83fb89d | |
| parent | 9d1102fa91c49d488f4f69487d6bff8d591d1dbc (diff) | |
| parent | f77080fd58f16303054c0bafb7b08b6de05f2f87 (diff) | |
| download | chouette-core-bfab1e4947c66f4232efd604cb952b95e43ad623.tar.bz2 | |
Merge branch 'rails4' of github.com:afimb/chouette2 into rails4
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 22 |
2 files changed, 13 insertions, 11 deletions
@@ -129,7 +129,7 @@ gem 'delayed_job_active_record' gem 'apartment' group :development do - gem 'capistrano' + gem 'capistrano', '2.13.5' gem 'capistrano-ext' gem 'guard' gem 'guard-rspec' diff --git a/Gemfile.lock b/Gemfile.lock index 79cfa1784..c010f01f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,10 +72,12 @@ GEM calendar_helper (0.2.5) open4 callsite (0.0.11) - capistrano (3.4.0) - i18n - rake (>= 10.0.0) - sshkit (~> 1.3) + capistrano (2.13.5) + highline + net-scp (>= 1.0.0) + net-sftp (>= 2.0.0) + net-ssh (>= 2.0.14) + net-ssh-gateway (>= 1.1.0) capistrano-ext (1.2.1) capistrano (>= 1.0.0) capybara (2.4.4) @@ -97,7 +99,6 @@ GEM coffee-script-source execjs coffee-script-source (1.9.1) - colorize (0.7.5) daemons (1.1.9) database_cleaner (1.4.1) dbf (2.0.9) @@ -183,6 +184,7 @@ GEM hashie_rails (0.0.2) activesupport (~> 4.0) hashie (>= 3.0) + highline (1.7.1) hike (1.2.3) hitimes (1.2.2) hitimes (1.2.2-java) @@ -244,7 +246,11 @@ GEM nenv (0.2.0) net-scp (1.2.1) net-ssh (>= 2.6.5) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) net-ssh (2.9.2) + net-ssh-gateway (1.2.0) + net-ssh (>= 2.6.5) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) nokogiri (1.6.6.2-java) @@ -406,10 +412,6 @@ GEM activerecord (>= 3.0) activesupport (>= 3.0) polyamorous (~> 1.1.0) - sshkit (1.7.1) - colorize (>= 0.7.0) - net-scp (>= 1.1.2) - net-ssh (>= 2.8.0) therubyracer (0.10.2) libv8 (~> 3.3.10) therubyrhino (2.0.4) @@ -466,7 +468,7 @@ DEPENDENCIES apartment breadcrumbs_on_rails calendar_helper (= 0.2.5) - capistrano + capistrano (= 2.13.5) capistrano-ext capybara (~> 2.4.0) cocoon |