summaryrefslogtreecommitdiff
path: root/app/models/repository.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/repository.rb')
-rw-r--r--app/models/repository.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index b47238b52f1..18f46916960 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -852,7 +852,7 @@ class Repository
def ff_merge(user, source, target_branch, merge_request: nil)
their_commit_id = commit(source)&.id
- raise 'Invalid merge source' if their_commit_id.nil?
+ raise _('Invalid merge source') if their_commit_id.nil?
merge_request&.update(in_progress_merge_commit_sha: their_commit_id)