Add latest changes from gitlab-org/gitlab@13-0-stable-ee

2 files changed, 7 insertions, 1 deletions

diff --git a/spec/features/markdown/copy_as_gfm_spec.rb b/spec/features/markdown/copy_as_gfm_spec.rb
index f85acc28645..d40c2b8bafd 100644
--- a/spec/features/markdown/copy_as_gfm_spec.rb
+++ b/spec/features/markdown/copy_as_gfm_spec.rb
@@ -173,6 +173,12 @@ describe 'Copy as GFM', :js do
       )
 
       verify_media_with_partial_path(
+        '[test.txt](/uploads/a123/image.txt)',
+
+        project_media_uri(@project, '/uploads/a123/image.txt')
+      )
+
+      verify_media_with_partial_path(
         '![Image](/uploads/a123/image.png)',
 
         project_media_uri(@project, '/uploads/a123/image.png')
diff --git a/spec/features/markdown/metrics_spec.rb b/spec/features/markdown/metrics_spec.rb
index dadb9571c54..7b0eb8959a5 100644
--- a/spec/features/markdown/metrics_spec.rb
+++ b/spec/features/markdown/metrics_spec.rb
@@ -137,7 +137,7 @@ describe 'Metrics rendering', :js, :use_clean_rails_memory_store_caching, :sidek
   end
 
   context 'transient metrics embeds' do
-    let(:metrics_url) { urls.metrics_project_environment_url(project, environment, embed_json: embed_json) }
+    let(:metrics_url) { urls.metrics_dashboard_project_environment_url(project, environment, embed_json: embed_json) }
     let(:title) { 'Important Metrics' }
     let(:embed_json) do
       {