Merge pull request #537 from coopdevs/develop

Release v2.1

Capfile

@@ -16,11 +16,7 @@ require 'capistrano/deploy'
 #   https://github.com/capistrano/passenger
 #
 require 'capistrano/rails'
-
-stage = ARGV.first
-if stage != 'production' # Sorry, production is not ready yet
-  require 'capistrano/rbenv'
-end
+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

@@ -10,7 +10,6 @@ gem 'has_scope'
 gem 'pundit', '~> 2.0.0'
 gem 'pg', '0.21.0'
 gem 'hstore_translate'
-gem 'dalli'
 gem 'devise', '~> 4.5.0'
 gem "http_accept_language", '~> 2.1.1'
 gem 'unicorn'

Gemfile.lock

@@ -107,7 +107,6 @@ GEM
     concurrent-ruby (1.1.5)
     connection_pool (2.2.1)
     crass (1.0.4)
-    dalli (2.7.2)
     database_cleaner (1.6.2)
     debug_inspector (0.0.3)
     devise (4.5.0)
@@ -405,7 +404,6 @@ DEPENDENCIES
   capistrano-rbenv (~> 2.1)
   capybara (~> 3.15)
   coffee-rails
-  dalli
   database_cleaner (= 1.6.2)
   devise (~> 4.5.0)
   dotenv-rails (~> 2.7.1)

app/models/user.rb

@@ -1,6 +1,4 @@
 class User < ActiveRecord::Base
-  include LazyRecoverable
-
   devise *[
     :database_authenticatable,
     :recoverable,

app/views/devise/passwords/new.html.erb

@@ -18,7 +18,7 @@
           <div class="form-group">
             <div class="row">
               <div class="col-xs-12">
-                <%= f.submit t(".send_instructions"), class: "btn btn-primary btn-lg col-xs-12" %>
+                <%= f.submit t(".send_instructions"), class: "btn btn-primary btn-lg col-xs-12", data: { disable_with: '...' } %>
               </div>
             </div>
           </div>

config/database.yml

@@ -31,8 +31,8 @@ staging:
   database: <%= ENV.fetch('DATABASE_NAME', 'timeoverflow_staging') %>
 
 production:
-  # Set DATABASE_URL environment variable
-  url: <%= ENV['DATABASE_URL'] %>
+  <<: *defaults
+  database: <%= ENV.fetch('DATABASE_NAME', 'timeoverflow_production') %>
 
 next:
   <<: *defaults

config/deploy.rb

@@ -47,13 +47,20 @@
 # Default value for keep_releases is 5
 # set :keep_releases, 5
 
-namespace :deploy do
-  after :restart, :clear_cache do
-    on roles(:web), in: :groups, limit: 3, wait: 10 do
-      # Here we can do anything such as:
-      # within release_path do
-      #   execute :rake, 'cache:clear'
-      # end
+namespace :unicorn do
+  desc 'reload Unicorn'
+  task :reload do
+    on roles(:app) do
+      execute "sudo systemctl reload timeoverflow"
+    end
+  end
+end
+
+namespace :sidekiq do
+  desc 'reload Sidekiq'
+  task :restart do
+    on roles(:app) do
+      execute "sudo systemctl restart sidekiq"
     end
   end
 end
@@ -67,4 +74,8 @@
     end
   end
 end
+
 before "deploy:migrate", "deploy:db:load" if ENV["COLD"]
+
+after "deploy:finishing", "unicorn:reload"
+after "deploy:finishing", "sidekiq:restart"

config/environments/next.rb

@@ -0,0 +1 @@
+config/environments/production.rb

config/environments/production.rb

@@ -56,7 +56,6 @@
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
-  config.cache_store = :dalli_store
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = 'http://assets.example.com'

config/environments/staging.rb

@@ -56,7 +56,6 @@
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
-  config.cache_store = :dalli_store
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = 'http://assets.example.com'