From 80f61b4035607d7cd87de993b8f5e996bde3481f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 18 Sep 2019 14:02:45 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/fixtures/markdown.md.erb | 2 +- spec/fixtures/trace/sample_trace | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/fixtures') diff --git a/spec/fixtures/markdown.md.erb b/spec/fixtures/markdown.md.erb index bbeacf1707b..8016cf7a86d 100644 --- a/spec/fixtures/markdown.md.erb +++ b/spec/fixtures/markdown.md.erb @@ -301,7 +301,7 @@ However the wrapping tags cannot be mixed as such: ### Mermaid > If this is not rendered correctly, see -https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md#mermaid +https://gitlab.com/gitlab-org/gitlab-foss/blob/master/doc/user/markdown.md#mermaid It is possible to generate diagrams and flowcharts from text using [Mermaid][mermaid]. diff --git a/spec/fixtures/trace/sample_trace b/spec/fixtures/trace/sample_trace index 8f9747f8143..d774d154496 100644 --- a/spec/fixtures/trace/sample_trace +++ b/spec/fixtures/trace/sample_trace @@ -34,7 +34,7 @@ Removing log/test_json.log Removing tmp/tests/ Removing vendor/ruby/ HEAD is now at b7cbff3d Add `direct_upload` setting for artifacts -From https://gitlab.com/gitlab-org/gitlab-ce +From https://gitlab.com/gitlab-org/gitlab-foss 2dbcb9cb..641bb13b master -> origin/master Checking out 21488c74 as master... Skipping Git submodules setup -- cgit v1.2.1