diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 03:08:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 03:08:47 +0000 |
| commit | 08ed6a867b690a04fe7a74c9ba697cf18f6107d7 (patch) | |
| tree | 9561a9aeee9a57cec168b143a76e6f65fd92ae0b /app/models/merge_request.rb | |
| parent | b0f27742e78a4aa4208c271536b6b9d84c53b49e (diff) | |
| download | gitlab-ce-08ed6a867b690a04fe7a74c9ba697cf18f6107d7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 6be14abe744..1f7760276bc 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -262,8 +262,6 @@ class MergeRequest < ApplicationRecord RebaseLockTimeout = Class.new(StandardError) - REBASE_LOCK_MESSAGE = _("Failed to enqueue the rebase operation, possibly due to a long-lived transaction. Try again later.") - def self.reference_prefix '!' end @@ -1514,7 +1512,7 @@ class MergeRequest < ApplicationRecord end rescue ActiveRecord::LockWaitTimeout => e Gitlab::ErrorTracking.track_exception(e) - raise RebaseLockTimeout, REBASE_LOCK_MESSAGE + raise RebaseLockTimeout, _('Failed to enqueue the rebase operation, possibly due to a long-lived transaction. Try again later.') end def source_project_variables |