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

32 files changed, 340 insertions, 22 deletions

diff --git a/spec/fixtures/api/schemas/entities/merge_request_noteable.json b/spec/fixtures/api/schemas/entities/merge_request_noteable.json
index c0eb320e67f..4ef19ed32c2 100644
--- a/spec/fixtures/api/schemas/entities/merge_request_noteable.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_noteable.json
@@ -32,7 +32,8 @@
     },
     "is_project_archived": { "type":  "boolean" },
     "locked_discussion_docs_path": { "type":  "string" },
-    "archived_project_docs_path": { "type":  "string" }
+    "archived_project_docs_path": { "type":  "string" },
+    "project_id": { "type": "integer"}
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/api/schemas/evidences/issue.json b/spec/fixtures/api/schemas/evidences/issue.json
index fd9daf17ab8..628c4c89312 100644
--- a/spec/fixtures/api/schemas/evidences/issue.json
+++ b/spec/fixtures/api/schemas/evidences/issue.json
@@ -4,7 +4,6 @@
     "id",
     "title",
     "description",
-    "author",
     "state",
     "iid",
     "confidential",
diff --git a/spec/fixtures/api/schemas/evidences/milestone.json b/spec/fixtures/api/schemas/evidences/milestone.json
index 3ce0644225b..ab27fdecde2 100644
--- a/spec/fixtures/api/schemas/evidences/milestone.json
+++ b/spec/fixtures/api/schemas/evidences/milestone.json
@@ -7,7 +7,8 @@
     "state",
     "iid",
     "created_at",
-    "due_date"
+    "due_date",
+    "issues"
   ],
   "properties": {
     "id": { "type": "integer" },
@@ -16,7 +17,11 @@
     "state": { "type": "string" },
     "iid": { "type": "integer" },
     "created_at": { "type": "date" },
-    "due_date": { "type": ["date", "null"] }
+    "due_date": { "type": ["date", "null"] },
+    "issues": {
+      "type": "array",
+      "items": { "$ref": "issue.json" }
+    }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/board.json b/spec/fixtures/api/schemas/public_api/v4/board.json
index e4933ee0b93..89a21c29969 100644
--- a/spec/fixtures/api/schemas/public_api/v4/board.json
+++ b/spec/fixtures/api/schemas/public_api/v4/board.json
@@ -78,7 +78,8 @@
           },
           "position": { "type": ["integer", "null"] },
           "max_issue_count": { "type": "integer" },
-          "max_issue_weight": { "type": "integer" }
+          "max_issue_weight": { "type": "integer" },
+          "limit_metric": { "type": ["string", "null"] }
         },
         "additionalProperties": false
       }
diff --git a/spec/fixtures/api/schemas/registry/repository.json b/spec/fixtures/api/schemas/registry/repository.json
index f7469aad235..1f84e787b19 100644
--- a/spec/fixtures/api/schemas/registry/repository.json
+++ b/spec/fixtures/api/schemas/registry/repository.json
@@ -1,13 +1,7 @@
 {
   "type": "object",
-  "required" : [
-    "id",
-    "name",
-    "path",
-    "location",
-    "created_at"
-  ],
-  "properties" : {
+  "required": ["id", "name", "path", "location", "created_at"],
+  "properties": {
     "id": {
       "type": "integer"
     },
@@ -38,7 +32,10 @@
         { "type": "string", "enum": ["delete_scheduled", "delete_failed"] }
       ]
     },
-    "tags": { "$ref": "tags.json" }
+    "tags": { "$ref": "tags.json" },
+    "tags_count": {
+      "type": "integer"
+    }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/api/schemas/release/link.json b/spec/fixtures/api/schemas/release/link.json
index bf175be2bc0..b3aebfa131e 100644
--- a/spec/fixtures/api/schemas/release/link.json
+++ b/spec/fixtures/api/schemas/release/link.json
@@ -7,7 +7,8 @@
     "filepath": { "type": "string" },
     "url": { "type": "string" },
     "direct_asset_url": { "type": "string" },
-    "external": { "type": "boolean" }
+    "external": { "type": "boolean" },
+    "link_type": { "type": "string" }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/gitlab/database/structure_example.sql b/spec/fixtures/gitlab/database/structure_example.sql
index 9f288e6067e..06db67b725a 100644
--- a/spec/fixtures/gitlab/database/structure_example.sql
+++ b/spec/fixtures/gitlab/database/structure_example.sql
@@ -48,7 +48,6 @@ CREATE TABLE public.abuse_reports (
 --
 
 CREATE SEQUENCE public.abuse_reports_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
diff --git a/spec/fixtures/gitlab/database/structure_example_cleaned.sql b/spec/fixtures/gitlab/database/structure_example_cleaned.sql
index 78120fa6ce0..5618fb694a0 100644
--- a/spec/fixtures/gitlab/database/structure_example_cleaned.sql
+++ b/spec/fixtures/gitlab/database/structure_example_cleaned.sql
@@ -1,7 +1,5 @@
 SET search_path=public;
 
-CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
-
 CREATE EXTENSION IF NOT EXISTS pg_trgm WITH SCHEMA public;
 
 CREATE TABLE public.abuse_reports (
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/sample_dashboard.yml b/spec/fixtures/lib/gitlab/metrics/dashboard/sample_dashboard.yml
index b460a031486..5177de66fcf 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/sample_dashboard.yml
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/sample_dashboard.yml
@@ -1,5 +1,18 @@
 dashboard: 'Test Dashboard'
 priority: 1
+links:
+- title: Link 1
+  url: https://gitlab.com
+- title: Link 2
+  url: https://docs.gitlab.com
+templating:
+  variables:
+    text_variable_full_syntax:
+      label: 'Variable 1'
+      type: text
+      options:
+        default_value: 'default'
+    text_variable_simple_syntax: 'default value'
 panel_groups:
 - group: Group A
   priority: 1
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json
index 5d779a323c2..259c41bf091 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json
@@ -11,7 +11,9 @@
     "panel_groups": {
       "type": "array",
       "items": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json" }
-    }
+    },
+    "templating": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json" },
+    "links": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json" }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json
new file mode 100644
index 00000000000..be180114052
--- /dev/null
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json
@@ -0,0 +1,9 @@
+{
+  "type": "array",
+  "required": ["url"],
+  "properties": {
+    "url": { "type": "string" },
+    "title": { "type": "string" }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json
new file mode 100644
index 00000000000..c82d2fcb02c
--- /dev/null
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json
@@ -0,0 +1,8 @@
+{
+  "type": "object",
+  "required": ["variables"],
+  "properties": {
+    "variables": { "$ref": "variables.json" }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json
new file mode 100644
index 00000000000..f5090dc8c88
--- /dev/null
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json
@@ -0,0 +1,12 @@
+{
+  "type": "object",
+  "required": [
+    "type", "options"
+  ],
+  "properties": {
+    "type": { "type": "string" },
+    "label": { "type": "string" },
+    "options": { "$ref": "text_variable_options.json" }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json
new file mode 100644
index 00000000000..ccb2e168fd1
--- /dev/null
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json
@@ -0,0 +1,7 @@
+{
+  "type": "object",
+  "properties": {
+    "default_value": { "type": "string" }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json
new file mode 100644
index 00000000000..f3e0dd555a6
--- /dev/null
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json
@@ -0,0 +1,12 @@
+{
+  "type": "object",
+  "patternProperties": {
+    "^[a-zA-Z0-9_]*$": {
+        "anyOf": [
+          { "$ref": "text_variable_full_syntax.json" },
+          { "type": "string" }
+        ]
+      }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/lsif.json.gz b/spec/fixtures/lsif.json.gz
deleted file mode 100644
index 3f74588cd7e..00000000000
--- a/spec/fixtures/lsif.json.gz
+++ /dev/null
diff --git a/spec/fixtures/packages/conan/package_files/conan_package.tgz b/spec/fixtures/packages/conan/package_files/conan_package.tgz
new file mode 100644
index 00000000000..6163364f3f9
--- /dev/null
+++ b/spec/fixtures/packages/conan/package_files/conan_package.tgz
diff --git a/spec/fixtures/packages/conan/package_files/conaninfo.txt b/spec/fixtures/packages/conan/package_files/conaninfo.txt
new file mode 100644
index 00000000000..2a02515a19b
--- /dev/null
+++ b/spec/fixtures/packages/conan/package_files/conaninfo.txt
@@ -0,0 +1,33 @@
+[settings]
+    arch=x86_64
+    build_type=Release
+    compiler=apple-clang
+    compiler.libcxx=libc++
+    compiler.version=10.0
+    os=Macos
+
+[requires]
+
+
+[options]
+    shared=False
+
+[full_settings]
+    arch=x86_64
+    build_type=Release
+    compiler=apple-clang
+    compiler.libcxx=libc++
+    compiler.version=10.0
+    os=Macos
+
+[full_requires]
+
+
+[full_options]
+    shared=False
+
+[recipe_hash]
+    b4b91125b36b40a7076a98310588f820
+
+[env]
+
diff --git a/spec/fixtures/packages/conan/package_files/conanmanifest.txt b/spec/fixtures/packages/conan/package_files/conanmanifest.txt
new file mode 100644
index 00000000000..bc34b81b050
--- /dev/null
+++ b/spec/fixtures/packages/conan/package_files/conanmanifest.txt
@@ -0,0 +1,4 @@
+1565723794
+conaninfo.txt: 2774ebe649804c1cd9430f26ab0ead14
+include/hello.h: 8727846905bd09baecf8bdc1edb1f46e
+lib/libhello.a: 7f2aaa8b6f3bc316bba59e47b6a0bd43
diff --git a/spec/fixtures/packages/conan/recipe_files/conanfile.py b/spec/fixtures/packages/conan/recipe_files/conanfile.py
new file mode 100644
index 00000000000..910bd5a0b51
--- /dev/null
+++ b/spec/fixtures/packages/conan/recipe_files/conanfile.py
@@ -0,0 +1,47 @@
+from conans import ConanFile, CMake, tools
+
+
+class HelloConan(ConanFile):
+    name = "Hello"
+    version = "0.1"
+    license = "<Put the package license here>"
+    author = "<Put your name here> <And your email here>"
+    url = "<Package recipe repository url here, for issues about the package>"
+    description = "<Description of Hello here>"
+    topics = ("<Put some tag here>", "<here>", "<and here>")
+    settings = "os", "compiler", "build_type", "arch"
+    options = {"shared": [True, False]}
+    default_options = "shared=False"
+    generators = "cmake"
+
+    def source(self):
+        self.run("git clone https://github.com/conan-io/hello.git")
+        # This small hack might be useful to guarantee proper /MT /MD linkage
+        # in MSVC if the packaged project doesn't have variables to set it
+        # properly
+        tools.replace_in_file("hello/CMakeLists.txt", "PROJECT(HelloWorld)",
+                              '''PROJECT(HelloWorld)
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup()''')
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure(source_folder="hello")
+        cmake.build()
+
+        # Explicit way:
+        # self.run('cmake %s/hello %s'
+        #          % (self.source_folder, cmake.command_line))
+        # self.run("cmake --build . %s" % cmake.build_config)
+
+    def package(self):
+        self.copy("*.h", dst="include", src="hello")
+        self.copy("*hello.lib", dst="lib", keep_path=False)
+        self.copy("*.dll", dst="bin", keep_path=False)
+        self.copy("*.so", dst="lib", keep_path=False)
+        self.copy("*.dylib", dst="lib", keep_path=False)
+        self.copy("*.a", dst="lib", keep_path=False)
+
+    def package_info(self):
+        self.cpp_info.libs = ["hello"]
+
diff --git a/spec/fixtures/packages/conan/recipe_files/conanmanifest.txt b/spec/fixtures/packages/conan/recipe_files/conanmanifest.txt
new file mode 100644
index 00000000000..432b12f39fa
--- /dev/null
+++ b/spec/fixtures/packages/conan/recipe_files/conanmanifest.txt
@@ -0,0 +1,2 @@
+1565723790
+conanfile.py: 7c042b95312cc4c4ee89199dc51aebf9
diff --git a/spec/fixtures/packages/maven/maven-metadata.xml b/spec/fixtures/packages/maven/maven-metadata.xml
new file mode 100644
index 00000000000..7d7549df227
--- /dev/null
+++ b/spec/fixtures/packages/maven/maven-metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata modelVersion="1.1.0">
+  <groupId>com.mycompany.app</groupId>
+  <artifactId>my-app</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <versioning>
+    <snapshot>
+      <timestamp>20180724.124855</timestamp>
+      <buildNumber>1</buildNumber>
+    </snapshot>
+    <lastUpdated>20180724124855</lastUpdated>
+    <snapshotVersions>
+      <snapshotVersion>
+        <extension>jar</extension>
+        <value>1.0-20180724.124855-1</value>
+        <updated>20180724124855</updated>
+      </snapshotVersion>
+      <snapshotVersion>
+        <extension>pom</extension>
+        <value>1.0-20180724.124855-1</value>
+        <updated>20180724124855</updated>
+      </snapshotVersion>
+    </snapshotVersions>
+  </versioning>
+</metadata>
diff --git a/spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.jar b/spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.jar
new file mode 100644
index 00000000000..ea3903cf6d9
--- /dev/null
+++ b/spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.jar
diff --git a/spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.pom b/spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.pom
new file mode 100644
index 00000000000..6b6015314aa
--- /dev/null
+++ b/spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.pom
@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.mycompany.app</groupId>
+  <artifactId>my-app</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>my-app</name>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <snapshotRepository>
+      <id>local</id>
+      <url>file:///tmp/maven</url>
+    </snapshotRepository>
+  </distributionManagement>
+  <repositories>
+    <repository>
+      <id>local</id>
+      <url>file:///tmp/maven</url>
+    </repository>
+  </repositories>
+  <properties>
+    <maven.compiler.source>1.6</maven.compiler.source>
+    <maven.compiler.target>1.6</maven.compiler.target>
+  </properties>
+</project>
diff --git a/spec/fixtures/packages/npm/foo-1.0.1.tgz b/spec/fixtures/packages/npm/foo-1.0.1.tgz
new file mode 100644
index 00000000000..a2bcdb8d492
--- /dev/null
+++ b/spec/fixtures/packages/npm/foo-1.0.1.tgz
diff --git a/spec/fixtures/packages/npm/payload.json b/spec/fixtures/packages/npm/payload.json
new file mode 100644
index 00000000000..664aa636001
--- /dev/null
+++ b/spec/fixtures/packages/npm/payload.json
@@ -0,0 +1,30 @@
+{
+   "_id":"@root/npm-test",
+   "name":"@root/npm-test",
+   "description":"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+   "dist-tags":{
+      "latest":"1.0.1"
+   },
+   "versions":{
+      "1.0.1":{
+         "name":"@root/npm-test",
+         "version":"1.0.1",
+         "main":"app.js",
+         "dependencies":{
+            "express":"^4.16.4"
+         },
+         "dist":{
+            "shasum":"f572d396fae9206628714fb2ce00f72e94f2258f"
+         }
+      }
+   },
+   "_attachments":{
+      "@root/npm-test-1.0.1.tgz":{
+         "content_type":"application/octet-stream",
+         "data":"aGVsbG8K",
+         "length":8
+      }
+   },
+   "id":"10",
+   "package_name":"@root/npm-test"
+}
diff --git a/spec/fixtures/packages/npm/payload_with_duplicated_packages.json b/spec/fixtures/packages/npm/payload_with_duplicated_packages.json
new file mode 100644
index 00000000000..a6ea8760bd5
--- /dev/null
+++ b/spec/fixtures/packages/npm/payload_with_duplicated_packages.json
@@ -0,0 +1,44 @@
+{
+  "_id":"@root/npm-test",
+  "name":"@root/npm-test",
+  "description":"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+  "dist-tags":{
+     "latest":"1.0.1"
+  },
+  "versions":{
+     "1.0.1":{
+        "name":"@root/npm-test",
+        "version":"1.0.1",
+        "main":"app.js",
+        "dependencies":{
+           "express":"^4.16.4",
+           "dagre-d3": "~0.3.2"
+        },
+        "devDependencies": {
+           "dagre-d3": "~0.3.2",
+           "d3": "~3.4.13"
+        },
+        "bundleDependencies": {
+           "d3": "~3.4.13"
+        },
+        "peerDependencies": {
+           "d3": "~3.3.0"
+        },
+        "deprecated": {
+           "express":"^4.16.4"
+        },
+        "dist":{
+           "shasum":"f572d396fae9206628714fb2ce00f72e94f2258f"
+        }
+     }
+  },
+  "_attachments":{
+     "@root/npm-test-1.0.1.tgz":{
+        "content_type":"application/octet-stream",
+        "data":"aGVsbG8K",
+        "length":8
+     }
+  },
+  "id":"10",
+  "package_name":"@root/npm-test"
+}
diff --git a/spec/fixtures/packages/nuget/package.nupkg b/spec/fixtures/packages/nuget/package.nupkg
new file mode 100644
index 00000000000..b36856ee569
--- /dev/null
+++ b/spec/fixtures/packages/nuget/package.nupkg
diff --git a/spec/fixtures/packages/nuget/with_dependencies.nuspec b/spec/fixtures/packages/nuget/with_dependencies.nuspec
new file mode 100644
index 00000000000..753037cd05b
--- /dev/null
+++ b/spec/fixtures/packages/nuget/with_dependencies.nuspec
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>Test.Package</id>
+    <version>3.5.2</version>
+    <authors>Test Author</authors>
+    <owners>Test Owner</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Package Description</description>
+    <dependencies>
+      <dependency id="Moqi" version="2.5.6" include="Runtime,Compile" />
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="Test.Dependency" version="2.3.7" exclude="Build,Analyzers" include="Runtime,Compile" />
+        <dependency id="Newtonsoft.Json" version="12.0.3" exclude="Build,Analyzers" />
+      </group>
+      <dependency id="Castle.Core" />
+    </dependencies>
+  </metadata>
+</package>
diff --git a/spec/fixtures/packages/nuget/with_metadata.nuspec b/spec/fixtures/packages/nuget/with_metadata.nuspec
new file mode 100644
index 00000000000..0043bc89527
--- /dev/null
+++ b/spec/fixtures/packages/nuget/with_metadata.nuspec
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>DummyProject.WithMetadata</id>
+    <version>1.2.3</version>
+    <title>nuspec with metadata</title>
+    <authors>Author Test</authors>
+    <owners>Author Test</owners>
+    <developmentDependency>true</developmentDependency>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
+    <projectUrl>https://gitlab.com/gitlab-org/gitlab</projectUrl>
+    <iconUrl>https://opensource.org/files/osi_keyhole_300X300_90ppi_0.png</iconUrl>
+    <description>Description Test</description>
+    <releaseNotes>Release Notes Test</releaseNotes>
+    <copyright>Copyright Test</copyright>
+    <tags>foo bar test tag1 tag2 tag3 tag4 tag5</tags>
+  </metadata>
+</package>
diff --git a/spec/fixtures/packages/pypi/sample-project.tar.gz b/spec/fixtures/packages/pypi/sample-project.tar.gz
new file mode 100644
index 00000000000..c71b1fef23d
--- /dev/null
+++ b/spec/fixtures/packages/pypi/sample-project.tar.gz
diff --git a/spec/fixtures/trace/sample_trace b/spec/fixtures/trace/sample_trace
index e9d1e79fc71..ebd2853e558 100644
--- a/spec/fixtures/trace/sample_trace
+++ b/spec/fixtures/trace/sample_trace
@@ -2736,9 +2736,6 @@ Service
       when repository is empty
         test runs execute
   Template
-    .build_from_template
-      when template is invalid
-        sets service template to inactive when template is invalid
     for pushover service
       is prefilled for projects pushover service
         has all fields prefilled