Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 2 deletions

diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index 18a6ad12240..a1416f3f563 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -136,7 +136,7 @@ RSpec.describe 'Jobs', :clean_gitlab_redis_shared_state do
         visit project_job_path(project, job)
 
         wait_for_requests
-        expect(page).to have_selector('.build-job.active')
+        expect(page).to have_selector('[data-testid="active-job"]')
       end
     end
 
@@ -255,7 +255,7 @@ RSpec.describe 'Jobs', :clean_gitlab_redis_shared_state do
       end
 
       it 'renders escaped tooltip name' do
-        page.find('.active.build-job a').hover
+        page.find('[data-testid="active-job"]').hover
         expect(page).to have_content('<img src=x onerror=alert(document.domain)> - passed')
       end
     end
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 825aa30e594..0be1b09851f 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -208,6 +208,7 @@ MergeRequest:
 - discussion_locked
 - allow_maintainer_to_push
 - merge_ref_sha
+- draft
 MergeRequestDiff:
 - id
 - state