Add latest changes from gitlab-org/gitlab@master

.rubocop.yml

@@ -393,10 +393,8 @@ RSpec/RepeatedExample:
     - 'spec/features/projects/files/template_type_dropdown_spec.rb'
     - 'spec/finders/environments_finder_spec.rb'
     - 'spec/frontend/fixtures/merge_requests.rb'
-    - 'spec/graphql/gitlab_schema_spec.rb'
     - 'spec/helpers/users_helper_spec.rb'
     - 'spec/lib/gitlab/closing_issue_extractor_spec.rb'
     - 'spec/lib/gitlab/import_export/project/relation_factory_spec.rb'
-    - 'spec/rubocop/cop/migration/update_large_table_spec.rb'
     - 'spec/services/notification_service_spec.rb'
     - 'spec/services/web_hook_service_spec.rb'

changelogs/unreleased/gitlab-schema-spec.yml

+---
+title: Add missing spec for gitlab schema
+merge_request: 28855
+author: Rajendra Kadam
+type: added

changelogs/unreleased/update-large-table-spec.yml

+---
+title: Update duplicate specs in update large table spec
+merge_request: 28787
+author: Rajendra Kadam
+type: added

spec/graphql/gitlab_schema_spec.rb

@@ -10,8 +10,8 @@ describe GitlabSchema do
     expect(field_instrumenters).to include(BatchLoader::GraphQL)
   end
 
-  it 'enables the preload instrumenter' do
-    expect(field_instrumenters).to include(BatchLoader::GraphQL)
+  it 'enables the generic instrumenter' do
+    expect(field_instrumenters).to include(instance_of(::Gitlab::Graphql::GenericTracing))
   end
 
   it 'enables the authorization instrumenter' do

spec/rubocop/cop/migration/update_large_table_spec.rb

@@ -76,14 +76,14 @@ describe RuboCop::Cop::Migration::UpdateLargeTable do
       expect(cop.offenses).to be_empty
     end
 
-    it 'registers no offense for update_column_in_batches' do
+    it 'registers no offense for rename_column_concurrently' do
       inspect_source("rename_column_concurrently :#{table}, :column, default: true")
 
       expect(cop.offenses).to be_empty
     end
 
-    it 'registers no offense for update_column_in_batches' do
-      inspect_source("add_column_with_default :#{table}, :column, default: true")
+    it 'registers no offense for update_column_concurrently' do
+      inspect_source("update_column_concurrently :#{table}, :column, default: true")
 
       expect(cop.offenses).to be_empty
     end