Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/sentry/init_sentry.js

@@ -25,6 +25,12 @@ const initSentry = () => {
     environment: gon.sentry_environment,
     autoSessionTracking: true,
 
+    ignoreErrors: [
+      // Network errors create noise in Sentry and can't be fixed, ignore them.
+      /Network Error/i,
+      /NetworkError/i,
+    ],
+
     // Browser tracing configuration
     enableTracing: true,
     tracePropagationTargets: [/^\//], // only trace internal requests

qa/qa/specs/features/api/12_systems/gitaly/praefect_replication_queue_spec.rb

@@ -44,7 +44,7 @@ module QA
           repository.uri = project.repository_http_location.uri
           repository.use_default_credentials
           repository.clone
-          repository.configure_identity('GitLab QA', 'root@gitlab.com')
+          repository.use_default_identity
           1.upto(queue_size_target) do |i|
             repository.checkout("branch#{i}", new_branch: true)
             repository.commit_file("file#{i}", SecureRandom.random_bytes(10000000), "Add file#{i}")

qa/qa/specs/features/api/3_create/repository/add_list_delete_branches_spec.rb

@@ -18,7 +18,7 @@ module QA
 
           repository.act do
             init_repository
-            configure_identity('GitLab QA', 'root@gitlab.com')
+            use_default_identity
 
             commit_file(filename, 'Test file content', default_branch_commit_message)
             push_changes

qa/qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb

@@ -37,7 +37,7 @@ module QA
           repository.init_repository
           repository.uri = "#{Runtime::Scenario.gitlab_address}/#{group.full_path}/#{project_name}"
           repository.use_default_credentials
-          repository.configure_identity('GitLab QA', 'root@gitlab.com')
+          repository.use_default_identity
           repository.checkout('trunk', new_branch: true)
           repository.commit_file('README.md', 'Created via the CLI', 'initial commit via CLI')
           repository.push_changes('trunk')

qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb

@@ -13,7 +13,7 @@ module QA
 
           repository.act do
             clone
-            configure_identity('GitLab QA', 'root@gitlab.com')
+            use_default_identity
             checkout(default_branch, new_branch: true)
             commit_file('test.rb', 'class Test; end', 'Add Test class')
             commit_file('README.md', '# Test', 'Add Readme')

qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb

@@ -17,13 +17,10 @@ module QA
         # Use Git to clone the project, push a file to it, and then check the
         # supported Git protocol
         Git::Repository.perform do |repository|
-          username = 'GitLab QA'
-          email = 'root@gitlab.com'
-
           repository.uri = project.repository_http_location.uri
           repository.use_default_credentials
           repository.clone
-          repository.configure_identity(username, email)
+          repository.use_default_identity
           repository.default_branch = project.default_branch
           repository.checkout(project.default_branch, new_branch: true)
 

qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb

@@ -36,15 +36,12 @@ module QA
         # Use Git to clone the project, push a file to it, and then check the
         # supported Git protocol
         Git::Repository.perform do |repository|
-          username = 'GitLab QA'
-          email = 'root@gitlab.com'
-
           repository.uri = project.repository_ssh_location.uri
 
           begin
             repository.use_ssh_key(ssh_key)
             repository.clone
-            repository.configure_identity(username, email)
+            repository.use_default_identity
             repository.default_branch = project.default_branch
             repository.checkout(project.default_branch, new_branch: true)
 

spec/frontend/sentry/init_sentry_spec.js

@@ -67,6 +67,7 @@ describe('SentryConfig', () => {
             allowUrls: [mockGitlabUrl, 'webpack-internal://'],
             environment: mockEnvironment,
             autoSessionTracking: true,
+            ignoreErrors: [/Network Error/i, /NetworkError/i],
             enableTracing: true,
             tracePropagationTargets: [/^\//],
             tracesSampleRate: mockSentryClientsideTracesSampleRate,