diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 12:07:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 12:07:54 +0300 |
| commit | 87ef501eacd66d7166183d20d84e33de022f7002 (patch) | |
| tree | fa4e0f41e00a4b6aeb035530be4b5473f51b7a3d /app/models/timelog.rb | |
| parent | f321e51f46bcb628c3e96a44b5ebf3bb1c4033ab (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/timelog.rb')
| -rw-r--r-- | app/models/timelog.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/timelog.rb b/app/models/timelog.rb index 4ddaf6bcb86..f52dd74d4c9 100644 --- a/app/models/timelog.rb +++ b/app/models/timelog.rb @@ -28,9 +28,9 @@ class Timelog < ApplicationRecord def issuable_id_is_present if issue_id && merge_request_id - errors.add(:base, 'Only Issue ID or Merge Request ID is required') + errors.add(:base, _('Only Issue ID or Merge Request ID is required')) elsif issuable.nil? - errors.add(:base, 'Issue or Merge Request ID is required') + errors.add(:base, _('Issue or Merge Request ID is required')) end end |