diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-15 18:09:43 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-15 18:09:43 +0000 |
commit | f784f7d3b19fe80834240bde23d1300accb01118 (patch) | |
tree | 2acd4a74cbcde10c5b70c356b146af78362862d1 /app/assets/javascripts/integrations/edit/index.js | |
parent | 06c127aa72cff78235426341081837cff0b6f78b (diff) | |
download | gitlab-ce-f784f7d3b19fe80834240bde23d1300accb01118.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/integrations/edit/index.js')
-rw-r--r-- | app/assets/javascripts/integrations/edit/index.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/javascripts/integrations/edit/index.js b/app/assets/javascripts/integrations/edit/index.js index 2ee25bcb1e7..5413226078d 100644 --- a/app/assets/javascripts/integrations/edit/index.js +++ b/app/assets/javascripts/integrations/edit/index.js @@ -24,11 +24,15 @@ function parseDatasetToProps(data) { fields, inheritFromId, integrationLevel, + cancelPath, + testPath, ...booleanAttributes } = data; const { showActive, activated, + editable, + canTest, commitEvents, mergeRequestEvents, enableComments, @@ -41,6 +45,10 @@ function parseDatasetToProps(data) { initialActivated: activated, showActive, type, + cancelPath, + editable, + canTest, + testPath, triggerFieldsProps: { initialTriggerCommit: commitEvents, initialTriggerMergeRequest: mergeRequestEvents, |