summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-17 00:07:59 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-17 00:07:59 +0000
commit7480d774dfca97ea905321d52c70fd19496f0084 (patch)
tree8b664509b6be79bbe226fdd3994dadae56864b83 /lib/gitlab
parent69d6d3ca2013e97cfd2d89449669ea7bf475f4e9 (diff)
downloadgitlab-ce-7480d774dfca97ea905321d52c70fd19496f0084.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/import_export/import_export.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index 2fd4f18b756..bf92de73b48 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -272,7 +272,7 @@ ee:
- :push_event_payload
- design_versions:
- actions:
- - :design # Duplicate export of issues.designs in order to link the record to both Issue and DesignVersion
+ - :design # Duplicate export of issues.designs in order to link the record to both Issue and Action
- protected_branches:
- :unprotect_access_levels
- protected_environments: