diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-13 15:07:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-13 15:07:41 +0300 |
| commit | 8cc5f2790908ba9bb8eecba2b78a3c5a88c77b90 (patch) | |
| tree | 2d6211503a5111d43a9edce0c56b94fd1b347e1b /app/models/merge_request.rb | |
| parent | 17b91a3c6ab73fff087e91665e9afb8046cbf045 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index bbc54987407..1671b1e2d55 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1514,7 +1514,7 @@ class MergeRequest < ApplicationRecord end end rescue ActiveRecord::LockWaitTimeout => e - Gitlab::Sentry.track_acceptable_exception(e) + Gitlab::Sentry.track_exception(e) raise RebaseLockTimeout, REBASE_LOCK_MESSAGE end |