remove conflict data

2018-02-27 14:35:21 +06:30
parent 3e0943275f 4d556cff43
commit adefd8c034
49 changed files with 1989 additions and 363 deletions
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -1,10 +1,12 @@
-class BaseOrigamiController < ApplicationController
+class BaseOrigamiController < ActionController::Base
+  include LoginVerification
  layout "origami"

  # before_action :checkin_process

  #before_action :check_installation
  protect_from_forgery with: :exception
+
  rescue_from CanCan::AccessDenied do |exception|
    flash[:warning] = exception.message
    # redirect_to origami_root_path