Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 16 insertions, 9 deletions

diff --git a/app/models/integrations/jira.rb b/app/models/integrations/jira.rb
index 74ece57000f..a800b9e5baa 100644
--- a/app/models/integrations/jira.rb
+++ b/app/models/integrations/jira.rb
@@ -94,10 +94,6 @@ module Integrations
       !!URI(url).hostname&.end_with?(JIRA_CLOUD_HOST)
     end
 
-    def initialize_properties
-      {}
-    end
-
     def data_fields
       jira_tracker_data || self.build_jira_tracker_data
     end
@@ -106,7 +102,7 @@ module Integrations
       return unless reset_password?
 
       data_fields.password = nil
-      properties.delete('password') if properties
+      self.properties = properties.except('password')
     end
 
     def set_default_data
@@ -143,7 +139,7 @@ module Integrations
     end
 
     def help
-      jira_doc_link_start = '<a href="%{url}">'.html_safe % { url: help_page_url('integration/jira/index.html') }
+      jira_doc_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('integration/jira/index') }
       s_("JiraService|You must configure Jira before enabling this integration. %{jira_doc_link_start}Learn more.%{link_end}") % { jira_doc_link_start: jira_doc_link_start, link_end: '</a>'.html_safe }
     end
 
@@ -160,8 +156,6 @@ module Integrations
     end
 
     def sections
-      jira_issues_link_start = '<a href="%{url}">'.html_safe % { url: help_page_url('integration/jira/issues.html') }
-
       sections = [
         {
           type: SECTION_TYPE_CONNECTION,
@@ -180,7 +174,7 @@ module Integrations
         sections.push({
           type: SECTION_TYPE_JIRA_ISSUES,
           title: _('Issues'),
-          description: s_('JiraService|Work on Jira issues without leaving GitLab. Add a Jira menu to access a read-only list of your Jira issues. %{jira_issues_link_start}Learn more.%{link_end}') % { jira_issues_link_start: jira_issues_link_start, link_end: '</a>'.html_safe }
+          description: jira_issues_section_description
         })
       end
 
@@ -610,6 +604,19 @@ module Integrations
         data_fields.deployment_server!
       end
     end
+
+    def jira_issues_section_description
+      jira_issues_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('integration/jira/issues') }
+      description = s_('JiraService|Work on Jira issues without leaving GitLab. Add a Jira menu to access a read-only list of your Jira issues. %{jira_issues_link_start}Learn more.%{link_end}') % { jira_issues_link_start: jira_issues_link_start, link_end: '</a>'.html_safe }
+
+      if project&.issues_enabled?
+        gitlab_issues_link_start = '<a href="%{url}">'.html_safe % { url: edit_project_path(project, anchor: 'js-shared-permissions') }
+        description += '<br><br>'.html_safe
+        description += s_("JiraService|Displaying Jira issues while leaving GitLab issues also enabled might be confusing. Consider %{gitlab_issues_link_start}disabling GitLab issues%{link_end} if they won't otherwise be used.") % { gitlab_issues_link_start: gitlab_issues_link_start, link_end: '</a>'.html_safe }
+      end
+
+      description
+    end
   end
 end