Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 10 insertions, 1 deletions

diff --git a/spec/graphql/types/merge_request_type_spec.rb b/spec/graphql/types/merge_request_type_spec.rb
index 8800250b103..51e7b4029d5 100644
--- a/spec/graphql/types/merge_request_type_spec.rb
+++ b/spec/graphql/types/merge_request_type_spec.rb
@@ -27,18 +27,27 @@ RSpec.describe GitlabSchema.types['MergeRequest'] do
       upvotes downvotes head_pipeline pipelines task_completion_status
       milestone assignees participants subscribed labels discussion_locked time_estimate
       total_time_spent reference author merged_at commit_count current_user_todos
-      conflicts auto_merge_enabled approved_by
+      conflicts auto_merge_enabled approved_by source_branch_protected
+      default_merge_commit_message_with_description squash_on_merge available_auto_merge_strategies
+      has_ci mergeable commits_without_merge_commits security_auto_fix
     ]
 
     if Gitlab.ee?
       expected_fields << 'approved'
       expected_fields << 'approvals_left'
       expected_fields << 'approvals_required'
+      expected_fields << 'merge_trains_count'
     end
 
     expect(described_class).to have_graphql_fields(*expected_fields)
   end
 
+  describe '#pipelines' do
+    subject { described_class.fields['pipelines'] }
+
+    it { is_expected.to have_attributes(max_page_size: 500) }
+  end
+
   describe '#diff_stats_summary' do
     subject { GitlabSchema.execute(query, context: { current_user: current_user }).as_json }