Merge branch 'gs-master' into glitch-theme

2017-12-04 11:07:01 -06:00
parent 1c74ede69e f2f2f10320
commit d9800a5647
214 changed files with 5378 additions and 1033 deletions
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@ -3,6 +3,7 @@
 module Admin
  class BaseController < ApplicationController
    include Authorization
+    include AccountableConcern

    layout 'admin'