Add latest changes from gitlab-org/gitlab@master

4 files changed, 2 insertions, 7 deletions

diff --git a/qa/qa/page/group/new.rb b/qa/qa/page/group/new.rb
index 88e7121dbe0..5f43cfb49c0 100644
--- a/qa/qa/page/group/new.rb
+++ b/qa/qa/page/group/new.rb
@@ -7,7 +7,6 @@ module QA
         view 'app/views/shared/_group_form.html.haml' do
           element :group_path_field, 'text_field :path' # rubocop:disable QA/ElementWithPattern
           element :group_name_field, 'text_field :name' # rubocop:disable QA/ElementWithPattern
-          element :group_description_field, 'text_area :description' # rubocop:disable QA/ElementWithPattern
         end
 
         view 'app/views/groups/_new_group_fields.html.haml' do
@@ -20,10 +19,6 @@ module QA
           fill_in 'group_name', with: path
         end
 
-        def set_description(description)
-          fill_in 'group_description', with: description
-        end
-
         def set_visibility(visibility)
           choose visibility
         end
diff --git a/qa/qa/page/project/pipeline/index.rb b/qa/qa/page/project/pipeline/index.rb
index bad492591ca..3bf2a80f32f 100644
--- a/qa/qa/page/project/pipeline/index.rb
+++ b/qa/qa/page/project/pipeline/index.rb
@@ -31,6 +31,8 @@ module QA
           end
 
           def wait_for_latest_pipeline_status
+            wait_until(max_duration: 30, reload: true, sleep_interval: 5) { has_pipeline? }
+
             wait_until(reload: false, max_duration: 360) do
               within_element_by_index(:pipeline_commit_status, 0) { yield }
             end
diff --git a/qa/qa/resource/group.rb b/qa/qa/resource/group.rb
index 2e29ec9a6a7..135c3dea628 100644
--- a/qa/qa/resource/group.rb
+++ b/qa/qa/resource/group.rb
@@ -36,7 +36,6 @@ module QA
 
             Page::Group::New.perform do |group_new|
               group_new.set_path(path)
-              group_new.set_description(description)
               group_new.set_visibility('Public')
               group_new.create
             end
diff --git a/qa/qa/resource/sandbox.rb b/qa/qa/resource/sandbox.rb
index 376600b727a..ae183d55d89 100644
--- a/qa/qa/resource/sandbox.rb
+++ b/qa/qa/resource/sandbox.rb
@@ -31,7 +31,6 @@ module QA
 
             Page::Group::New.perform do |group|
               group.set_path(path)
-              group.set_description('GitLab QA Sandbox Group')
               group.set_visibility('Public')
               group.create
             end