diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 15:09:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 15:09:36 +0300 |
| commit | c6a33b298229f9e04933be43d6176c476ef03012 (patch) | |
| tree | 66b336ef374b813d6e9c7f6a19264060a1f23f91 /app/models | |
| parent | c52b81f45762cb7f05a950689dfc6d51b197ea73 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/container_expiration_policy.rb | 1 | ||||
| -rw-r--r-- | app/models/project.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/container_expiration_policy.rb b/app/models/container_expiration_policy.rb index ccb0a0f8acd..76bfbabf3b3 100644 --- a/app/models/container_expiration_policy.rb +++ b/app/models/container_expiration_policy.rb @@ -2,6 +2,7 @@ class ContainerExpirationPolicy < ApplicationRecord include Schedulable + include UsageStatistics belongs_to :project, inverse_of: :container_expiration_policy diff --git a/app/models/project.rb b/app/models/project.rb index 4cd92b119b4..ee4cc6157eb 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -787,7 +787,7 @@ class Project < ApplicationRecord end def jira_issues_import_feature_flag_enabled? - Feature.enabled?(:jira_issue_import, self) + Feature.enabled?(:jira_issue_import, self, default_enabled: true) end def team |