summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-07-22 16:24:53 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-07-22 16:24:53 +0000
commit31bd1b4cf3d9d255de3208c6e78c3bc8f94fb269 (patch)
treecb765e19d8177f44c7db29a3ca86364705076314
parent8073b0554fc8f7dddc250025aaf5cedd09f423cb (diff)
parent79a45426d5b9a186f5b75085b5dd6529a573c131 (diff)
downloadgitlab-ce-31bd1b4cf3d9d255de3208c6e78c3bc8f94fb269.tar.gz
Merge branch 'remove-duplicate-all-models-entry' into 'master'
Remove duplicate entry from all_models.yml See merge request gitlab-org/gitlab-ce!31010
-rw-r--r--spec/lib/gitlab/import_export/all_models.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 7baa52ffb4f..929b6222900 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -343,7 +343,6 @@ project:
- fork_network_member
- fork_network
- custom_attributes
-- prometheus_metrics
- lfs_file_locks
- project_badges
- source_of_merge_requests