diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 00:06:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 00:06:03 +0000 |
| commit | 8c726c7487db581867ade785f798d84315cb787e (patch) | |
| tree | aaf96b1cf74942fbb26b2aa379f9d51c8f874617 /app | |
| parent | 1da3754b25657f49afdcb0b942506d365b1ee89d (diff) | |
| download | gitlab-ce-8c726c7487db581867ade785f798d84315cb787e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/deployment.rb | 2 | ||||
| -rw-r--r-- | app/models/release.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/models/deployment.rb b/app/models/deployment.rb index db7f9e06362..30694313f7a 100644 --- a/app/models/deployment.rb +++ b/app/models/deployment.rb @@ -180,3 +180,5 @@ class Deployment < ApplicationRecord self.created_at if success? && !read_attribute(:finished_at) end end + +Deployment.prepend_if_ee('EE::Deployment') diff --git a/app/models/release.rb b/app/models/release.rb index 9117a475ee9..8759e38060c 100644 --- a/app/models/release.rb +++ b/app/models/release.rb @@ -67,3 +67,5 @@ class Release < ApplicationRecord end end end + +Release.prepend_if_ee('EE::Release') |