Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 2 deletions

diff --git a/spec/features/issues/bulk_assignment_labels_spec.rb b/spec/features/issues/bulk_assignment_labels_spec.rb
index 57d04f0bf40..d036fde5657 100644
--- a/spec/features/issues/bulk_assignment_labels_spec.rb
+++ b/spec/features/issues/bulk_assignment_labels_spec.rb
@@ -306,7 +306,7 @@ describe 'Issues > Labels bulk assignment' do
       end
     end
 
-    # Special case https://gitlab.com/gitlab-org/gitlab-ce/issues/24877
+    # Special case https://gitlab.com/gitlab-org/gitlab-foss/issues/24877
     context 'unmarking common label' do
       before do
         issue1.labels << bug
diff --git a/spec/features/issues/gfm_autocomplete_spec.rb b/spec/features/issues/gfm_autocomplete_spec.rb
index cc834df367b..0ff3809a915 100644
--- a/spec/features/issues/gfm_autocomplete_spec.rb
+++ b/spec/features/issues/gfm_autocomplete_spec.rb
@@ -27,6 +27,8 @@ describe 'GFM autocomplete', :js do
   it 'updates issue description with GFM reference' do
     find('.js-issuable-edit').click
 
+    wait_for_requests
+
     simulate_input('#issue-description', "@#{user.name[0...3]}")
 
     wait_for_requests
diff --git a/spec/features/issues/user_interacts_with_awards_spec.rb b/spec/features/issues/user_interacts_with_awards_spec.rb
index eab18b72c86..095ae9f276c 100644
--- a/spec/features/issues/user_interacts_with_awards_spec.rb
+++ b/spec/features/issues/user_interacts_with_awards_spec.rb
@@ -243,7 +243,7 @@ describe 'User interacts with awards' do
           wait_for_requests
         end
 
-        # Regression test: https://gitlab.com/gitlab-org/gitlab-ce/issues/29529
+        # Regression test: https://gitlab.com/gitlab-org/gitlab-foss/issues/29529
         it 'does not shows a 500 page', :js do
           expect(page).to have_text(issue.title)
         end