Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/ce-4681-autosave.yml

+---
+title: Autosave description in epics
+merge_request: 27296
+author:
+type: added

spec/requests/api/graphql/gitlab_schema_spec.rb

@@ -5,7 +5,7 @@ describe 'GitlabSchema configurations' do
 
   it 'shows an error if complexity is too high' do
     project = create(:project, :repository)
-    query   = graphql_query_for('project', { 'fullPath' => project.full_path }, "id\nname\ndescription")
+    query   = graphql_query_for('project', { 'fullPath' => project.full_path }, %w(id name description))
 
     allow(GitlabSchema).to receive(:max_query_complexity).and_return 1
 

spec/support/helpers/graphql_helpers.rb

@@ -83,7 +83,8 @@ module GraphqlHelpers
   end
 
   def wrap_fields(fields)
-    return unless fields.strip.present?
+    fields = Array.wrap(fields).join("\n")
+    return unless fields.present?
 
     <<~FIELDS
     {