summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorMark Chao <mchao@gitlab.com>2018-06-08 13:12:51 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2018-06-08 13:12:51 +0000
commit68cb1c2651fde0ae009beed10f81a74172ceeab1 (patch)
treef8a191e5916b38d00abc747d35cd3e77dd640296 /spec
parente1f9f3c6ac8a71c8196c8eae7d4c573899466cdf (diff)
downloadgitlab-ce-68cb1c2651fde0ae009beed10f81a74172ceeab1.tar.gz
Revert rename allow collaboration column
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/gitlab/import_export/safe_model_attributes.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 4354dca25ea..0a1e3eb83d3 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -170,7 +170,7 @@ MergeRequest:
- last_edited_by_id
- head_pipeline_id
- discussion_locked
-- allow_collaboration
+- allow_maintainer_to_push
MergeRequestDiff:
- id
- state