Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

4 files changed, 30 insertions, 6 deletions

diff --git a/spec/frontend/fixtures/api_markdown.yml b/spec/frontend/fixtures/api_markdown.yml
index a83d5374e2c..a1ea2806879 100644
--- a/spec/frontend/fixtures/api_markdown.yml
+++ b/spec/frontend/fixtures/api_markdown.yml
@@ -48,3 +48,7 @@
     3. list item 3
 - name: image
   markdown: '![alt text](https://gitlab.com/logo.png)'
+- name: hard_break
+  markdown: |-
+    This is a line after a\
+    hard break
diff --git a/spec/frontend/fixtures/merge_requests.rb b/spec/frontend/fixtures/merge_requests.rb
index 418912638f9..f10f96f2516 100644
--- a/spec/frontend/fixtures/merge_requests.rb
+++ b/spec/frontend/fixtures/merge_requests.rb
@@ -62,8 +62,14 @@ RSpec.describe Projects::MergeRequestsController, '(JavaScript fixtures)', type:
     remove_repository(project)
   end
 
+  it 'merge_requests/merge_request_with_single_assignee_feature.html' do
+    stub_licensed_features(multiple_merge_request_assignees: false)
+
+    render_merge_request(merge_request)
+  end
+
   it 'merge_requests/merge_request_of_current_user.html' do
-    merge_request.update(author: user)
+    merge_request.update!(author: user)
 
     render_merge_request(merge_request)
   end
diff --git a/spec/frontend/fixtures/raw.rb b/spec/frontend/fixtures/raw.rb
index cf51f2389bc..44927bd29d8 100644
--- a/spec/frontend/fixtures/raw.rb
+++ b/spec/frontend/fixtures/raw.rb
@@ -25,6 +25,10 @@ RSpec.describe 'Raw files', '(JavaScript fixtures)' do
     @blob = project.repository.blob_at('6d85bb69', 'files/ipython/basic.ipynb')
   end
 
+  it 'blob/notebook/markdown-table.json' do
+    @blob = project.repository.blob_at('f6b7a707', 'files/ipython/markdown-table.ipynb')
+  end
+
   it 'blob/notebook/worksheets.json' do
     @blob = project.repository.blob_at('6d85bb69', 'files/ipython/worksheets.ipynb')
   end
diff --git a/spec/frontend/fixtures/releases.rb b/spec/frontend/fixtures/releases.rb
index dc282b49be5..7ec155fcb10 100644
--- a/spec/frontend/fixtures/releases.rb
+++ b/spec/frontend/fixtures/releases.rb
@@ -119,16 +119,18 @@ RSpec.describe 'Releases (JavaScript fixtures)' do
   describe GraphQL::Query, type: :request do
     include GraphqlHelpers
 
-    all_releases_query_path = 'releases/queries/all_releases.query.graphql'
-    one_release_query_path = 'releases/queries/one_release.query.graphql'
-    fragment_paths = ['releases/queries/release.fragment.graphql']
+    all_releases_query_path = 'releases/graphql/queries/all_releases.query.graphql'
+    one_release_query_path = 'releases/graphql/queries/one_release.query.graphql'
+    one_release_for_editing_query_path = 'releases/graphql/queries/one_release_for_editing.query.graphql'
+    release_fragment_path = 'releases/graphql/fragments/release.fragment.graphql'
+    release_for_editing_fragment_path = 'releases/graphql/fragments/release_for_editing.fragment.graphql'
 
     before(:all) do
       clean_frontend_fixtures('graphql/releases/')
     end
 
     it "graphql/#{all_releases_query_path}.json" do
-      query = get_graphql_query_as_string(all_releases_query_path, fragment_paths)
+      query = get_graphql_query_as_string(all_releases_query_path, [release_fragment_path])
 
       post_graphql(query, current_user: admin, variables: { fullPath: project.full_path })
 
@@ -136,7 +138,15 @@ RSpec.describe 'Releases (JavaScript fixtures)' do
     end
 
     it "graphql/#{one_release_query_path}.json" do
-      query = get_graphql_query_as_string(one_release_query_path, fragment_paths)
+      query = get_graphql_query_as_string(one_release_query_path, [release_fragment_path])
+
+      post_graphql(query, current_user: admin, variables: { fullPath: project.full_path, tagName: release.tag })
+
+      expect_graphql_errors_to_be_empty
+    end
+
+    it "graphql/#{one_release_for_editing_query_path}.json" do
+      query = get_graphql_query_as_string(one_release_for_editing_query_path, [release_for_editing_fragment_path])
 
       post_graphql(query, current_user: admin, variables: { fullPath: project.full_path, tagName: release.tag })