summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2019-05-06 10:45:21 +0000
committerBob Van Landuyt <bob@gitlab.com>2019-05-06 10:45:21 +0000
commitd7adc4cf3ca53fee784c2e0966f127334a9dad54 (patch)
treea3d8cbe984e8ef33e3db1df5a1c74bde58e73b31 /spec/lib
parentd7eb886b9fd32ad2d0ab7bca9128dbb40e80c0da (diff)
parentd4d2cf7327ed077e063d64dcfe3b8275286c2d06 (diff)
downloadgitlab-ce-d7adc4cf3ca53fee784c2e0966f127334a9dad54.tar.gz
Merge branch 'fix-merge-request-pipeline-exist-method' into 'master'
Fix duplicate merge request pipelines created by Sidekiq worker retry See merge request gitlab-org/gitlab-ce!26643
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/import_export/all_models.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 482e9c05da8..2242543daad 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -99,7 +99,7 @@ merge_requests:
- timelogs
- head_pipeline
- latest_merge_request_diff
-- merge_request_pipelines
+- pipelines_for_merge_request
- merge_request_assignees
- suggestions
- assignees