Add latest changes from gitlab-org/gitlab@master

3 files changed, 32 insertions, 2 deletions

diff --git a/qa/qa/page/group/menu.rb b/qa/qa/page/group/menu.rb
index 6353895ffd4..2b3b872aff4 100644
--- a/qa/qa/page/group/menu.rb
+++ b/qa/qa/page/group/menu.rb
@@ -10,6 +10,7 @@ module QA
           element :group_settings_item
           element :group_members_item
           element :general_settings_link
+          element :contribution_analytics_link
         end
 
         def click_group_members_item
@@ -18,6 +19,12 @@ module QA
           end
         end
 
+        def click_group_analytics_item
+          within_sidebar do
+            click_element(:contribution_analytics_link)
+          end
+        end
+
         def click_group_general_settings_item
           hover_element(:group_settings_item) do
             within_submenu(:group_sidebar_submenu) do
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index 54a08d911cb..9ad53636c42 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -26,7 +26,7 @@ module QA
         end
 
         view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue' do
-          element :merged_status, 'The changes were merged into' # rubocop:disable QA/ElementWithPattern
+          element :merged_status_content
         end
 
         view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue' do
@@ -86,13 +86,31 @@ module QA
           has_element?(:merge_moment_dropdown)
         end
 
+        def merged?
+          has_element? :merged_status_content, text: 'The changes were merged into'
+        end
+
         def merge_immediately
+          wait(reload: false, max: 60) do
+            has_merge_options?
+          end
+
           if has_merge_options?
-            click_element :merge_moment_dropdown
+            if has_no_element? :merge_immediately_option
+              retry_until do
+                click_element :merge_moment_dropdown
+                has_element? :merge_immediately_option
+              end
+            end
+
             click_element :merge_immediately_option
           else
             click_element :merge_button
           end
+
+          wait(reload: false, max: 60) do
+            merged?
+          end
         end
 
         def rebase!
diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb
index 2322b5607b0..0622cb925f9 100644
--- a/qa/qa/page/project/issue/show.rb
+++ b/qa/qa/page/project/issue/show.rb
@@ -44,6 +44,7 @@ module QA
           end
 
           view 'app/views/shared/issuable/_close_reopen_button.html.haml' do
+            element :close_issue_button
             element :reopen_issue_button
           end
 
@@ -84,6 +85,10 @@ module QA
             click_element(:remove_related_issue_button)
           end
 
+          def click_close_issue_button
+            click_element :close_issue_button
+          end
+
           # Adds a comment to an issue
           # attachment option should be an absolute path
           def comment(text, attachment: nil, filter: :all_activities)