Update devise invitable

Author: jurre

Gemfile

@@ -22,7 +22,7 @@ gem "title"
 gem "uglifier"
 gem "unicorn"
 gem "devise", "~> 4.7.1"
-gem "devise_invitable", "~> 1.5.5"
+gem "devise_invitable"
 gem "apartment", "~> 0.26.0"
 gem "pikaday-gem", "~> 1.2.0.0"
 gem "momentjs-rails"

Gemfile.lock

@@ -651,9 +651,9 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise_invitable (1.5.5)
-      actionmailer (>= 3.2.6, < 5)
-      devise (>= 3.2.0)
+    devise_invitable (1.7.5)
+      actionmailer (>= 4.1.0)
+      devise (>= 4.0.0)
     diff-lcs (1.3)
     docile (1.1.5)
     dotenv (0.11.1)
@@ -912,7 +912,7 @@ DEPENDENCIES
   database_cleaner
   delayed_job_active_record (= 4.0.3)
   devise (~> 4.7.1)
-  devise_invitable (~> 1.5.5)
+  devise_invitable
   dotenv-rails
   email_spec
   email_validator

app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
@@ -10,8 +12,8 @@ class ApplicationController < ActionController::Base
   protected
 
   def configure_permitted_parameters
-    devise_parameter_sanitizer.for(:accept_invitation).
-      concat([:first_name, :last_name])
+    devise_parameter_sanitizer.permit(:accept_invitation,
+                                      keys: %i[first_name last_name])
   end
 
   def authenticate_inviter!
@@ -27,8 +29,10 @@ def after_invite_path_for(*)
   helper_method :current_subdomain, :current_user_owner?
 
   def current_subdomain
-    @current_subdomain ||=
-      current_account.subdomain unless Hours.single_tenant_mode?
+    unless Hours.single_tenant_mode?
+      @current_subdomain ||=
+        current_account.subdomain
+    end
   end
 
   def current_user_owner?
@@ -40,7 +44,7 @@ def current_account
   end
 
   def load_schema
-    Apartment::Tenant.switch("public")
+    Apartment::Tenant.switch('public')
     return unless request.subdomain.present?
 
     if current_account