diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /app/models/timelog.rb | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) | |
download | gitlab-ce-9dc93a4519d9d5d7be48ff274127136236a3adb3.tar.gz |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
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 f4debedb656..c1aa84cbbcd 100644 --- a/app/models/timelog.rb +++ b/app/models/timelog.rb @@ -31,9 +31,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 |