summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2016-08-07 15:14:24 +0200
committerHarald Eilertsen <haraldei@anduin.net>2016-08-07 15:14:24 +0200
commit6675ea1534517f7dc86240a1aba74bf94342c449 (patch)
treee451bab5cfd8e9073aebaf68ab2a60626f571b1f
parent190ae7266ead4e434a07dc0e411bb6a63a480c3e (diff)
downloadnorsk-urskog-registrations-6675ea1534517f7dc86240a1aba74bf94342c449.tar.gz
norsk-urskog-registrations-6675ea1534517f7dc86240a1aba74bf94342c449.tar.bz2
norsk-urskog-registrations-6675ea1534517f7dc86240a1aba74bf94342c449.zip
Drop dependencies to capistrano-passenger and capistrano-rvm.
-rw-r--r--Capfile2
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock9
3 files changed, 1 insertions, 12 deletions
diff --git a/Capfile b/Capfile
index a58bcc2..f694590 100644
--- a/Capfile
+++ b/Capfile
@@ -4,9 +4,7 @@ require 'capistrano/setup'
# Include default deployment tasks
require 'capistrano/deploy'
-require 'capistrano/rvm'
require 'capistrano/bundler'
-require 'capistrano/passenger'
# Load custom tasks from `lib/capistrano/tasks` if you have any defined
Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
diff --git a/Gemfile b/Gemfile
index 28417ca..28b9bdf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,6 +18,4 @@ end
group :development do
gem "capistrano"
gem "capistrano-bundler"
- gem "capistrano-passenger"
- gem "capistrano-rvm"
end
diff --git a/Gemfile.lock b/Gemfile.lock
index dc1a8b9..5d00744 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -16,11 +16,6 @@ GEM
capistrano-bundler (1.1.4)
capistrano (~> 3.1)
sshkit (~> 1.2)
- capistrano-passenger (0.2.0)
- capistrano (~> 3.0)
- capistrano-rvm (0.1.2)
- capistrano (~> 3.0)
- sshkit (~> 1.2)
capybara (2.5.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -125,8 +120,6 @@ DEPENDENCIES
byebug
capistrano
capistrano-bundler
- capistrano-passenger
- capistrano-rvm
capybara
mail
mailcatcher
@@ -139,4 +132,4 @@ DEPENDENCIES
sinatra-url-for
BUNDLED WITH
- 1.10.6
+ 1.12.5