Commit 711e9c9c authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'app-models-3' into 'master'

Move prepend to last line in app models - 3

See merge request gitlab-org/gitlab!31829
parents b11f7da6 134a6c82
......@@ -2,7 +2,6 @@
class ProjectAuthorization < ApplicationRecord
include FromUnion
prepend_if_ee('::EE::ProjectAuthorization') # rubocop: disable Cop/InjectEnterpriseEditionModule
belongs_to :user
belongs_to :project
......@@ -30,3 +29,5 @@ class ProjectAuthorization < ApplicationRecord
end
end
end
ProjectAuthorization.prepend_if_ee('::EE::ProjectAuthorization')
......@@ -2,8 +2,6 @@
module ChatMessage
class MergeMessage < BaseMessage
prepend_if_ee('::EE::ChatMessage::MergeMessage') # rubocop: disable Cop/InjectEnterpriseEditionModule
attr_reader :merge_request_iid
attr_reader :source_branch
attr_reader :target_branch
......@@ -71,3 +69,5 @@ module ChatMessage
end
end
end
ChatMessage::MergeMessage.prepend_if_ee('::EE::ChatMessage::MergeMessage')
---
title: Move prepend to last line in app models 3
merge_request: 31829
author: Rajendra Kadam
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment