diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue')
-rw-r--r-- | app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue | 5 |
1 files changed, 4 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 9bc01cdd9fc..ec93980251b 100644 --- a/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue +++ b/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue @@ -1,5 +1,6 @@ <script> import { GlFormGroup, GlFormCheckbox, GlFormInput, GlSprintf, GlLink } from '@gitlab/ui'; +import { mapGetters } from 'vuex'; import eventHub from '../event_hub'; import JiraUpgradeCta from './jira_upgrade_cta.vue'; @@ -70,6 +71,7 @@ export default { }; }, computed: { + ...mapGetters(['isInheriting']), validProjectKey() { return !this.enableJiraIssues || Boolean(this.projectKey) || !this.validated; }, @@ -116,7 +118,7 @@ export default { </p> <template v-if="showJiraIssuesIntegration"> <input name="service[issues_enabled]" type="hidden" :value="enableJiraIssues || false" /> - <gl-form-checkbox v-model="enableJiraIssues"> + <gl-form-checkbox v-model="enableJiraIssues" :disabled="isInheriting"> {{ s__('JiraService|Enable Jira issues') }} <template #help> {{ @@ -161,6 +163,7 @@ export default { :required="enableJiraIssues" :state="validProjectKey" :disabled="!enableJiraIssues" + :readonly="isInheriting" /> </gl-form-group> <p v-if="gitlabIssuesEnabled"> |