summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 21:09:22 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 21:09:22 +0000
commit8b5c2a4525819c6b18f422b4baa0f6568286909b (patch)
tree7c59a1e6b4b411c88b53eb046121e9d9b25930df /spec/fixtures
parent5bfb8d1fad825eec90b0af688c7cd1b352c9056e (diff)
downloadgitlab-ce-8b5c2a4525819c6b18f422b4baa0f6568286909b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/lib/gitlab/import_export/complex/project.json2
-rw-r--r--spec/fixtures/lib/gitlab/import_export/light/project.json4
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/fixtures/lib/gitlab/import_export/complex/project.json b/spec/fixtures/lib/gitlab/import_export/complex/project.json
index 72ed8b818d8..0fbe33a3f8a 100644
--- a/spec/fixtures/lib/gitlab/import_export/complex/project.json
+++ b/spec/fixtures/lib/gitlab/import_export/complex/project.json
@@ -7312,7 +7312,7 @@
"tag_push_events": true,
"note_events": true,
"job_events": true,
- "type": "AssemblaService",
+ "type": "AsanaService",
"category": "common",
"default": false,
"wiki_page_events": true
diff --git a/spec/fixtures/lib/gitlab/import_export/light/project.json b/spec/fixtures/lib/gitlab/import_export/light/project.json
index 51e2e9ac623..c0ef3690d27 100644
--- a/spec/fixtures/lib/gitlab/import_export/light/project.json
+++ b/spec/fixtures/lib/gitlab/import_export/light/project.json
@@ -125,7 +125,7 @@
},
{
"id": 101,
- "title": "JetBrains TeamCity CI",
+ "title": "Jira",
"project_id": 5,
"created_at": "2016-06-14T15:01:51.315Z",
"updated_at": "2016-06-14T15:01:51.315Z",
@@ -139,7 +139,7 @@
"tag_push_events": true,
"note_events": true,
"job_events": true,
- "type": "TeamcityService",
+ "type": "JiraService",
"category": "ci",
"default": false,
"wiki_page_events": true