summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2017-09-13 17:11:10 +0300
committerEric Eastwood <contact@ericeastwood.com>2017-09-19 23:48:40 -0500
commit7af585f1667935165701ec290e6ce37a436ad4c6 (patch)
tree8905263cdf5e28c740176cb9dff827d33c38f5aa /spec/lib
parentdede5f01889e31ae7dd1e3b45f6b3852e7c0e18a (diff)
downloadgitlab-ce-7af585f1667935165701ec290e6ce37a436ad4c6.tar.gz
Fast forward merge: basic implemenation[ci skip]
Diffstat (limited to 'spec/lib')
-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 899d17d97c2..64b8e7f7e18 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -412,6 +412,7 @@ Project:
- last_repository_updated_at
- ci_config_path
- delete_error
+- merge_requests_ff_only_enabled
Author:
- name
ProjectFeature: