diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 09:07:57 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 09:07:57 +0000 |
commit | 7881eb30eaa8b01dbcfe87faa09927c75c7d6e45 (patch) | |
tree | 298bc8d2c62b2f2c29cb8ecbcf3de3eaaa6466d9 /qa/qa/resource/merge_request.rb | |
parent | 64b66e0cb6d1bfd27abf24e06653f00bddb60597 (diff) | |
download | gitlab-ce-7881eb30eaa8b01dbcfe87faa09927c75c7d6e45.tar.gz |
Add latest changes from gitlab-org/gitlab@12-6-stable-ee
Diffstat (limited to 'qa/qa/resource/merge_request.rb')
-rw-r--r-- | qa/qa/resource/merge_request.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/qa/qa/resource/merge_request.rb b/qa/qa/resource/merge_request.rb index 1a6de8de456..24fb96a20a2 100644 --- a/qa/qa/resource/merge_request.rb +++ b/qa/qa/resource/merge_request.rb @@ -65,17 +65,17 @@ module QA project.visit! Page::Project::Show.perform(&:new_merge_request) - Page::MergeRequest::New.perform do |new| - new.fill_title(@title) - new.fill_description(@description) - new.choose_milestone(@milestone) if @milestone - new.assign_to_me if @assignee == 'me' + Page::MergeRequest::New.perform do |new_page| + new_page.fill_title(@title) + new_page.fill_description(@description) + new_page.choose_milestone(@milestone) if @milestone + new_page.assign_to_me if @assignee == 'me' labels.each do |label| - new.select_label(label) + new_page.select_label(label) end - new.add_approval_rules(approval_rules) if approval_rules + new_page.add_approval_rules(approval_rules) if approval_rules - new.create_merge_request + new_page.create_merge_request end end |