diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
| commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
| tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /app/models/global_milestone.rb | |
| parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
| download | gitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'app/models/global_milestone.rb')
| -rw-r--r-- | app/models/global_milestone.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/global_milestone.rb b/app/models/global_milestone.rb index d0cec0e9fc6..43de7454cb7 100644 --- a/app/models/global_milestone.rb +++ b/app/models/global_milestone.rb @@ -2,7 +2,6 @@ # Global Milestones are milestones that can be shared across multiple projects class GlobalMilestone include Milestoneish - include_if_ee('::EE::GlobalMilestone') # rubocop: disable Cop/InjectEnterpriseEditionModule STATE_COUNT_HASH = { opened: 0, closed: 0, all: 0 }.freeze @@ -11,7 +10,7 @@ class GlobalMilestone delegate :title, :state, :due_date, :start_date, :participants, :project, :group, :expires_at, :closed?, :iid, :group_milestone?, :safe_title, - :milestoneish_id, :resource_parent, :releases, to: :milestone + :timebox_id, :milestoneish_id, :resource_parent, :releases, to: :milestone def to_hash { @@ -105,3 +104,5 @@ class GlobalMilestone true end end + +GlobalMilestone.include_if_ee('::EE::GlobalMilestone') |