summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-06-01 12:58:11 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-06-01 12:58:11 +0200
commitaa0d6b07b6a87459e75c69111643b9d6fe8a97c2 (patch)
treede3e618a8d778eaef3e31e17e8a3a6659d0866b8 /spec/lib/gitlab
parent0532883622dde885ec2a120616b31aadaad4c5d2 (diff)
parent1a438e9f710edfa50408d93a363a240bdcd532c1 (diff)
downloadgitlab-ce-aa0d6b07b6a87459e75c69111643b9d6fe8a97c2.tar.gz
Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pipeline-stages
* feature/gb/migrate-pipeline-stages: Use stage_id column in code that needs to know about it
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r--spec/lib/gitlab/import_export/safe_model_attributes.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 96054c996fd..2388aea24d9 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -212,6 +212,7 @@ CommitStatus:
- stage
- trigger_request_id
- stage_idx
+- stage_id
- tag
- ref
- user_id