diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 03:08:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 03:08:26 +0000 |
| commit | 32d52eb6dd32c58016fa99e05078836cb0dcabde (patch) | |
| tree | 7f42649d0a1fb5ff9c3996d4cdcc9464d116169c /qa/qa/page/merge_request | |
| parent | 66ce6a78f6203652c34bd0532b63c394d5394cc4 (diff) | |
| download | gitlab-ce-32d52eb6dd32c58016fa99e05078836cb0dcabde.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/page/merge_request')
| -rw-r--r-- | qa/qa/page/merge_request/show.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index ad5b3c97cb9..940b7f332c7 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -155,6 +155,8 @@ module QA def merge! click_element :merge_button if ready_to_merge? + finished_loading? + raise "Merge did not appear to be successful" unless merged? end |