Revert "Merge pull request #314 from coopdevs/feature/staging"

This reverts commit 94a4ad8, reversing
changes made to 6660a79.

Capfile

@@ -16,7 +16,6 @@ require 'capistrano/deploy'
 #   https://github.com/capistrano/passenger
 #
 require 'capistrano/rails'
-require 'capistrano/rbenv'
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

Gemfile

@@ -47,7 +47,6 @@ group :development do
   gem 'web-console', '2.1.3'
   gem 'capistrano', '~> 3.1'
   gem 'capistrano-rails', '~> 1.1'
-  gem 'capistrano-rbenv', '~> 2.1'
   gem 'airbrussh', require: false
   gem "quiet_assets"
   gem 'localeapp', '2.1.1', require: false

Gemfile.lock

@@ -93,9 +93,6 @@ GEM
     capistrano-rails (1.1.5)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
-    capistrano-rbenv (2.1.3)
-      capistrano (~> 3.1)
-      sshkit (~> 1.3)
     capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -387,7 +384,6 @@ DEPENDENCIES
   byebug
   capistrano (~> 3.1)
   capistrano-rails (~> 1.1)
-  capistrano-rbenv (~> 2.1)
   capybara (~> 2.4.4)
   coffee-rails
   dalli

config/database.yml

@@ -25,10 +25,6 @@ test:
   <<: *defaults
   database: <%= ENV.fetch('DATABASE_NAME', 'timeoverflow_test') %>
 
-staging:
-  <<: *defaults
-  database: <%= ENV.fetch('DATABASE_NAME', 'timeoverflow_staging') %>
-
 production:
   # Set DATABASE_URL environment variable
   url: <%= ENV['DATABASE_URL'] %>

config/deploy.rb

@@ -4,10 +4,8 @@
 set :application, 'timeoverflow'
 set :repo_url, '[email protected]:coopdevs/timeoverflow.git'
 
-set :rbenv_type, :user
-
 # Default branch is :master
-ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp
+# ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp
 
 # Default deploy_to directory is /var/www/my_app_name
 # set :deploy_to, '/var/www/my_app_name'

config/deploy/staging.rb

@@ -1 +0,0 @@
-server 'staging.timeoverflow.org', user: 'timeoverflow', roles: %w(app db web)

config/secrets.yml

@@ -4,8 +4,5 @@ development:
 test:
   secret_key_base: fde628fa241d74a55d7b0fc8fe1b650091e296d6a4d1e51beba3bfa2ed5c143801c28aaadf318aaefc4423bca781f9715441298052b4f704a8c44f97968feb00
 
-staging:
-  secret_key_base: <%= ENV['SECRET_TOKEN'] %>
-
 production:
   secret_key_base: <%= ENV['SECRET_TOKEN'] %>