diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 03:06:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 03:06:05 +0300 |
| commit | 8dfb94309c3e84937189f73a4149d654e20332e9 (patch) | |
| tree | 1543a7b74b2e5c683a39fd93b09afc578f758c2b /lib | |
| parent | 170f0bdcdef9c9b226abfe0a50d6687c65e8d613 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/merge_requests.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 1436238c5cf..a18380586a7 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -455,6 +455,8 @@ module API status :accepted present rebase_in_progress: merge_request.rebase_in_progress? + rescue ::MergeRequest::RebaseLockTimeout => e + render_api_error!(e.message, 409) end desc 'List issues that will be closed on merge' do |