Merge branch 'develop' into standalone_develop

app/controllers/application_controller.rb

@@ -704,9 +704,15 @@ class ApplicationController < ActionController::Base
 		# 	@project = nil if !@project.is_public?
 		# 	render_forbidden and return
     else
-			logger.info "###########：project not found"
+			if @project.present? 
-      @project = nil
+				logger.info "###########： has project and but can't read project"
-      render_not_found and return
+				@project = nil
+				render_forbidden and return
+			else 
+				logger.info "###########：project not found"
+				@project = nil
+				render_not_found and return
+			end
     end
     @project
 	end

app/models/message_template.rb

@@ -13,7 +13,7 @@
 #
 
 class MessageTemplate < ApplicationRecord
-  self.inheritance_column = nil
+  # self.inheritance_column = nil
   PLATFORM = 'GitLink'
 
   def self.build_init_data