Add latest changes from gitlab-org/gitlab@13-2-stable-ee

10 files changed, 129 insertions, 75 deletions

diff --git a/app/models/project_services/alerts_service.rb b/app/models/project_services/alerts_service.rb
index 58c47accfd1..28902114f3c 100644
--- a/app/models/project_services/alerts_service.rb
+++ b/app/models/project_services/alerts_service.rb
@@ -78,3 +78,5 @@ class AlertsService < Service
     Gitlab::Routing.url_helpers
   end
 end
+
+AlertsService.prepend_if_ee('EE::AlertsService')
diff --git a/app/models/project_services/bugzilla_service.rb b/app/models/project_services/bugzilla_service.rb
index 0a498fde95a..4332db3e961 100644
--- a/app/models/project_services/bugzilla_service.rb
+++ b/app/models/project_services/bugzilla_service.rb
@@ -3,11 +3,11 @@
 class BugzillaService < IssueTrackerService
   validates :project_url, :issues_url, :new_issue_url, presence: true, public_url: true, if: :activated?
 
-  def default_title
+  def title
     'Bugzilla'
   end
 
-  def default_description
+  def description
     s_('IssueTracker|Bugzilla issue tracker')
   end
 
diff --git a/app/models/project_services/confluence_service.rb b/app/models/project_services/confluence_service.rb
new file mode 100644
index 00000000000..dd44a0d1d56
--- /dev/null
+++ b/app/models/project_services/confluence_service.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+class ConfluenceService < Service
+  include ActionView::Helpers::UrlHelper
+
+  VALID_SCHEME_MATCH = %r{\Ahttps?\Z}.freeze
+  VALID_HOST_MATCH = %r{\A.+\.atlassian\.net\Z}.freeze
+  VALID_PATH_MATCH = %r{\A/wiki(/|\Z)}.freeze
+
+  prop_accessor :confluence_url
+
+  validates :confluence_url, presence: true, if: :activated?
+  validate :validate_confluence_url_is_cloud, if: :activated?
+
+  after_commit :cache_project_has_confluence
+
+  def self.to_param
+    'confluence'
+  end
+
+  def self.supported_events
+    %w()
+  end
+
+  def title
+    s_('ConfluenceService|Confluence Workspace')
+  end
+
+  def description
+    s_('ConfluenceService|Connect a Confluence Cloud Workspace to your GitLab project')
+  end
+
+  def detailed_description
+    return unless project.wiki_enabled?
+
+    if activated?
+      wiki_url = project.wiki.web_url
+
+      s_(
+        'ConfluenceService|Your GitLab Wiki can be accessed here: %{wiki_link}. To re-enable your GitLab Wiki, disable this integration' %
+        { wiki_link: link_to(wiki_url, wiki_url) }
+      ).html_safe
+    else
+      s_('ConfluenceService|Enabling the Confluence Workspace will disable the default GitLab Wiki. Your GitLab Wiki data will be saved and you can always re-enable it later by turning off this integration').html_safe
+    end
+  end
+
+  def fields
+    [
+      {
+        type: 'text',
+        name: 'confluence_url',
+        title: 'Confluence Cloud Workspace URL',
+        placeholder: s_('ConfluenceService|The URL of the Confluence Workspace'),
+        required: true
+      }
+    ]
+  end
+
+  def can_test?
+    false
+  end
+
+  private
+
+  def validate_confluence_url_is_cloud
+    unless confluence_uri_valid?
+      errors.add(:confluence_url, 'URL must be to a Confluence Cloud Workspace hosted on atlassian.net')
+    end
+  end
+
+  def confluence_uri_valid?
+    return false unless confluence_url
+
+    uri = URI.parse(confluence_url)
+
+    (uri.scheme&.match(VALID_SCHEME_MATCH) &&
+      uri.host&.match(VALID_HOST_MATCH) &&
+      uri.path&.match(VALID_PATH_MATCH)).present?
+
+  rescue URI::InvalidURIError
+    false
+  end
+
+  def cache_project_has_confluence
+    return unless project && !project.destroyed?
+
+    project.project_setting.save! unless project.project_setting.persisted?
+    project.project_setting.update_column(:has_confluence, active?)
+  end
+end
diff --git a/app/models/project_services/custom_issue_tracker_service.rb b/app/models/project_services/custom_issue_tracker_service.rb
index dbc42b1b86d..fc58ba27c3d 100644
--- a/app/models/project_services/custom_issue_tracker_service.rb
+++ b/app/models/project_services/custom_issue_tracker_service.rb
@@ -3,11 +3,11 @@
 class CustomIssueTrackerService < IssueTrackerService
   validates :project_url, :issues_url, :new_issue_url, presence: true, public_url: true, if: :activated?
 
-  def default_title
+  def title
     'Custom Issue Tracker'
   end
 
-  def default_description
+  def description
     s_('IssueTracker|Custom issue tracker')
   end
 
@@ -17,8 +17,6 @@ class CustomIssueTrackerService < IssueTrackerService
 
   def fields
     [
-      { type: 'text', name: 'title', placeholder: title },
-      { type: 'text', name: 'description', placeholder: description },
       { type: 'text', name: 'project_url', placeholder: 'Project url', required: true },
       { type: 'text', name: 'issues_url', placeholder: 'Issue url', required: true },
       { type: 'text', name: 'new_issue_url', placeholder: 'New Issue url', required: true }
diff --git a/app/models/project_services/gitlab_issue_tracker_service.rb b/app/models/project_services/gitlab_issue_tracker_service.rb
index ec28602b5e6..b3f44e040bc 100644
--- a/app/models/project_services/gitlab_issue_tracker_service.rb
+++ b/app/models/project_services/gitlab_issue_tracker_service.rb
@@ -7,11 +7,11 @@ class GitlabIssueTrackerService < IssueTrackerService
 
   default_value_for :default, true
 
-  def default_title
+  def title
     'GitLab'
   end
 
-  def default_description
+  def description
     s_('IssueTracker|GitLab issue tracker')
   end
 
diff --git a/app/models/project_services/issue_tracker_service.rb b/app/models/project_services/issue_tracker_service.rb
index f5d6ae10469..694374e9548 100644
--- a/app/models/project_services/issue_tracker_service.rb
+++ b/app/models/project_services/issue_tracker_service.rb
@@ -25,28 +25,6 @@ class IssueTrackerService < Service
     end
   end
 
-  # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
-  def title
-    if title_attribute = read_attribute(:title)
-      title_attribute
-    elsif self.properties && self.properties['title'].present?
-      self.properties['title']
-    else
-      default_title
-    end
-  end
-
-  # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
-  def description
-    if description_attribute = read_attribute(:description)
-      description_attribute
-    elsif self.properties && self.properties['description'].present?
-      self.properties['description']
-    else
-      default_description
-    end
-  end
-
   def handle_properties
     # this has been moved from initialize_properties and should be improved
     # as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
@@ -54,13 +32,6 @@ class IssueTrackerService < Service
 
     @legacy_properties_data = properties.dup
     data_values = properties.slice!('title', 'description')
-    properties.each do |key, _|
-      current_value = self.properties.delete(key)
-      value = attribute_changed?(key) ? attribute_change(key).last : current_value
-
-      write_attribute(key, value)
-    end
-
     data_values.reject! { |key| data_fields.changed.include?(key) }
     data_values.slice!(*data_fields.attributes.keys)
     data_fields.assign_attributes(data_values) if data_values.present?
@@ -102,7 +73,6 @@ class IssueTrackerService < Service
 
   def fields
     [
-      { type: 'text', name: 'description', placeholder: description },
       { type: 'text', name: 'project_url', placeholder: 'Project url', required: true },
       { type: 'text', name: 'issues_url', placeholder: 'Issue url', required: true },
       { type: 'text', name: 'new_issue_url', placeholder: 'New Issue url', required: true }
@@ -117,8 +87,6 @@ class IssueTrackerService < Service
   def set_default_data
     return unless issues_tracker.present?
 
-    self.title ||= issues_tracker['title']
-
     # we don't want to override if we have set something
     return if project_url || issues_url || new_issue_url
 
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index bb4d35cad22..4ea2ec10f11 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -23,7 +23,7 @@ class JiraService < IssueTrackerService
 
   # TODO: we can probably just delegate as part of
   # https://gitlab.com/gitlab-org/gitlab/issues/29404
-  data_field :username, :password, :url, :api_url, :jira_issue_transition_id
+  data_field :username, :password, :url, :api_url, :jira_issue_transition_id, :project_key, :issues_enabled
 
   before_update :reset_password
 
@@ -64,8 +64,6 @@ class JiraService < IssueTrackerService
   def set_default_data
     return unless issues_tracker.present?
 
-    self.title ||= issues_tracker['title']
-
     return if url
 
     data_fields.url ||= issues_tracker['url']
@@ -103,11 +101,11 @@ class JiraService < IssueTrackerService
     [Jira service documentation](#{help_page_url('user/project/integrations/jira')})."
   end
 
-  def default_title
+  def title
     'Jira'
   end
 
-  def default_description
+  def description
     s_('JiraService|Jira issue tracker')
   end
 
@@ -130,7 +128,7 @@ class JiraService < IssueTrackerService
   end
 
   def new_issue_url
-    "#{url}/secure/CreateIssue.jspa"
+    "#{url}/secure/CreateIssue!default.jspa"
   end
 
   alias_method :original_url, :url
@@ -442,3 +440,5 @@ class JiraService < IssueTrackerService
     end
   end
 end
+
+JiraService.prepend_if_ee('EE::JiraService')
diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb
index 44a41969b1c..997c6eba91a 100644
--- a/app/models/project_services/prometheus_service.rb
+++ b/app/models/project_services/prometheus_service.rb
@@ -28,6 +28,9 @@ class PrometheusService < MonitoringService
 
   after_create_commit :create_default_alerts
 
+  scope :preload_project, -> { preload(:project) }
+  scope :with_clusters_with_cilium, -> { joins(project: [:clusters]).merge(Clusters::Cluster.with_available_cilium) }
+
   def initialize_properties
     if properties.nil?
       self.properties = {}
@@ -51,7 +54,7 @@ class PrometheusService < MonitoringService
   end
 
   def fields
-    result = [
+    [
       {
         type: 'checkbox',
         name: 'manual_configuration',
@@ -64,30 +67,23 @@ class PrometheusService < MonitoringService
         title: 'API URL',
         placeholder: s_('PrometheusService|Prometheus API Base URL, like http://prometheus.example.com/'),
         required: true
+      },
+      {
+        type: 'text',
+        name: 'google_iap_audience_client_id',
+        title: 'Google IAP Audience Client ID',
+        placeholder: s_('PrometheusService|Client ID of the IAP secured resource (looks like IAP_CLIENT_ID.apps.googleusercontent.com)'),
+        autocomplete: 'off',
+        required: false
+      },
+      {
+        type: 'textarea',
+        name: 'google_iap_service_account_json',
+        title: 'Google IAP Service Account JSON',
+        placeholder: s_('PrometheusService|Contents of the credentials.json file of your service account, like: { "type": "service_account", "project_id": ... }'),
+        required: false
       }
     ]
-
-    if Feature.enabled?(:prometheus_service_iap_auth)
-      result += [
-        {
-          type: 'text',
-          name: 'google_iap_audience_client_id',
-          title: 'Google IAP Audience Client ID',
-          placeholder: s_('PrometheusService|Client ID of the IAP secured resource (looks like IAP_CLIENT_ID.apps.googleusercontent.com)'),
-          autocomplete: 'off',
-          required: false
-        },
-        {
-          type: 'textarea',
-          name: 'google_iap_service_account_json',
-          title: 'Google IAP Service Account JSON',
-          placeholder: s_('PrometheusService|Contents of the credentials.json file of your service account, like: { "type": "service_account", "project_id": ... }'),
-          required: false
-        }
-      ]
-    end
-
-    result
   end
 
   # Check we can connect to the Prometheus API
@@ -103,7 +99,7 @@ class PrometheusService < MonitoringService
 
     options = { allow_local_requests: allow_local_api_url? }
 
-    if Feature.enabled?(:prometheus_service_iap_auth) && behind_iap?
+    if behind_iap?
       # Adds the Authorization header
       options[:headers] = iap_client.apply({})
     end
diff --git a/app/models/project_services/redmine_service.rb b/app/models/project_services/redmine_service.rb
index a4ca0d20669..df78520d65f 100644
--- a/app/models/project_services/redmine_service.rb
+++ b/app/models/project_services/redmine_service.rb
@@ -3,11 +3,11 @@
 class RedmineService < IssueTrackerService
   validates :project_url, :issues_url, :new_issue_url, presence: true, public_url: true, if: :activated?
 
-  def default_title
+  def title
     'Redmine'
   end
 
-  def default_description
+  def description
     s_('IssueTracker|Redmine issue tracker')
   end
 
diff --git a/app/models/project_services/youtrack_service.rb b/app/models/project_services/youtrack_service.rb
index 40203ad692d..7fb3bde44a5 100644
--- a/app/models/project_services/youtrack_service.rb
+++ b/app/models/project_services/youtrack_service.rb
@@ -12,11 +12,11 @@ class YoutrackService < IssueTrackerService
     end
   end
 
-  def default_title
+  def title
     'YouTrack'
   end
 
-  def default_description
+  def description
     s_('IssueTracker|YouTrack issue tracker')
   end
 
@@ -26,7 +26,6 @@ class YoutrackService < IssueTrackerService
 
   def fields
     [
-      { type: 'text', name: 'description', placeholder: description },
       { type: 'text', name: 'project_url', title: 'Project URL', placeholder: 'Project URL', required: true },
       { type: 'text', name: 'issues_url', title: 'Issue URL', placeholder: 'Issue URL', required: true }
     ]