summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-11-21 11:07:46 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-11-21 11:07:46 +0000
commitb98193c55edc94b3ecf1ff143ac85fa9e9d8f029 (patch)
tree1318c8c4d5ce2b590de7d1c3d686787a244203ac /spec/lib
parent53714ddf2bcc56659236d87647d8b8e8412592f3 (diff)
parentd399e1ae2b92bc399962a286fddc59eaa09670a7 (diff)
downloadgitlab-ce-b98193c55edc94b3ecf1ff143ac85fa9e9d8f029.tar.gz
Merge branch 'issue_5541' into 'master'
Allow to block JIRA events for commits and merge requests implements #5541 See merge request !7469
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/import_export/safe_model_attributes.yml3
1 files changed, 2 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 07a2c316899..d6807941b31 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -258,6 +258,7 @@ Service:
- template
- push_events
- issues_events
+- commit_events
- merge_requests_events
- tag_push_events
- note_events
@@ -339,4 +340,4 @@ LabelPriority:
- label_id
- priority
- created_at
-- updated_at \ No newline at end of file
+- updated_at