diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:10:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:10:18 +0300 |
| commit | 520f3178665de5e7d313d332989cd445da83817b (patch) | |
| tree | 9db17960cfdd6f6be1deaee57d32e7d7956f2d84 /app/models/concerns/issuable.rb | |
| parent | 3b963d69199b2e4dd0a0c0b64efcf715242a5d8b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/issuable.rb')
| -rw-r--r-- | app/models/concerns/issuable.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index dd5aedbb760..46cd9649c2d 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -181,6 +181,14 @@ module Issuable false end + def supports_time_tracking? + is_a?(TimeTrackable) && !incident? + end + + def incident? + is_a?(Issue) && super + end + private def description_max_length_for_new_records_is_valid |