Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

3 files changed, 4 insertions, 7 deletions

diff --git a/app/assets/javascripts/integrations/edit/components/active_checkbox.vue b/app/assets/javascripts/integrations/edit/components/active_checkbox.vue
index 1e33ceb7835..f7d7f4aa010 100644
--- a/app/assets/javascripts/integrations/edit/components/active_checkbox.vue
+++ b/app/assets/javascripts/integrations/edit/components/active_checkbox.vue
@@ -37,7 +37,6 @@ export default {
     <input name="service[active]" type="hidden" :value="activated || false" />
     <gl-form-checkbox
       v-model="activated"
-      name="service[active]"
       class="gl-display-block"
       :disabled="isInheriting"
       @change="onChange"
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 aea4a8b1c0b..9bc01cdd9fc 100644
--- a/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue
+++ b/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue
@@ -1,6 +1,5 @@
 <script>
 import { GlFormGroup, GlFormCheckbox, GlFormInput, GlSprintf, GlLink } from '@gitlab/ui';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import eventHub from '../event_hub';
 import JiraUpgradeCta from './jira_upgrade_cta.vue';
 
@@ -16,7 +15,6 @@ export default {
     JiraIssueCreationVulnerabilities: () =>
       import('ee_component/integrations/edit/components/jira_issue_creation_vulnerabilities.vue'),
   },
-  mixins: [glFeatureFlagsMixin()],
   props: {
     showJiraIssuesIntegration: {
       type: Boolean,
@@ -76,7 +74,7 @@ export default {
       return !this.enableJiraIssues || Boolean(this.projectKey) || !this.validated;
     },
     showJiraVulnerabilitiesOptions() {
-      return this.showJiraVulnerabilitiesIntegration && this.glFeatures.jiraForVulnerabilities;
+      return this.showJiraVulnerabilitiesIntegration;
     },
     showUltimateUpgrade() {
       return this.showJiraIssuesIntegration && !this.showJiraVulnerabilitiesIntegration;
diff --git a/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue b/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue
index b0f19e5b585..93d8bcc4c19 100644
--- a/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue
+++ b/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue
@@ -16,13 +16,13 @@ const commentDetailOptions = [
   {
     value: 'standard',
     label: s__('Integrations|Standard'),
-    help: s__('Integrations|Includes commit title and branch'),
+    help: s__('Integrations|Includes commit title and branch.'),
   },
   {
     value: 'all_details',
     label: s__('Integrations|All details'),
     help: s__(
-      'Integrations|Includes Standard plus entire commit message, commit hash, and issue IDs',
+      'Integrations|Includes Standard, plus the entire commit message, commit hash, and issue IDs',
     ),
   },
 ];
@@ -144,7 +144,7 @@ export default {
       label-for="service[trigger]"
       :description="
         s__(
-          'Integrations|When a Jira issue is mentioned in a commit or merge request a remote link and comment (if enabled) is created.',
+          'Integrations|When you mention a Jira issue in a commit or merge request, GitLab creates a remote link and comment (if enabled).',
         )
       "
     >