diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-02 15:10:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-02 15:10:35 +0300 |
| commit | 4fa04f789e6fed5f0dfeafe718eeb7f56a5086e9 (patch) | |
| tree | 5ef2d1d8232d3bd359ec79bf95c9a35ce650ae0b /app/assets/javascripts/integrations | |
| parent | 4b9ace6c1fead1b44f173eaee0cfaa58f46a258a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/integrations')
| -rw-r--r-- | app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue | 7 | ||||
| -rw-r--r-- | app/assets/javascripts/integrations/edit/index.js | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue b/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue index 5a1f86718b0..1baa2b440b0 100644 --- a/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue +++ b/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue @@ -37,6 +37,11 @@ export default { required: false, default: null, }, + gitlabIssuesEnabled: { + type: Boolean, + required: false, + default: true, + }, upgradePlanPath: { type: String, required: false, @@ -133,7 +138,7 @@ export default { :disabled="!enableJiraIssues" /> </gl-form-group> - <p> + <p v-if="gitlabIssuesEnabled"> <gl-sprintf :message=" s__( diff --git a/app/assets/javascripts/integrations/edit/index.js b/app/assets/javascripts/integrations/edit/index.js index 915884dabef..2ee25bcb1e7 100644 --- a/app/assets/javascripts/integrations/edit/index.js +++ b/app/assets/javascripts/integrations/edit/index.js @@ -34,6 +34,7 @@ function parseDatasetToProps(data) { enableComments, showJiraIssuesIntegration, enableJiraIssues, + gitlabIssuesEnabled, } = parseBooleanInData(booleanAttributes); return { @@ -50,6 +51,7 @@ function parseDatasetToProps(data) { showJiraIssuesIntegration, initialEnableJiraIssues: enableJiraIssues, initialProjectKey: projectKey, + gitlabIssuesEnabled, upgradePlanPath, editProjectPath, }, |