Add latest changes from gitlab-org/gitlab@master

4 files changed, 90 insertions, 77 deletions

diff --git a/app/finders/groups/user_groups_finder.rb b/app/finders/groups/user_groups_finder.rb
index 90367638dcf..c77599530df 100644
--- a/app/finders/groups/user_groups_finder.rb
+++ b/app/finders/groups/user_groups_finder.rb
@@ -41,7 +41,7 @@ module Groups
     def by_search(items)
       return items if params[:search].blank?
 
-      items.search(params[:search])
+      items.search(params[:search], include_parents: true)
     end
 
     def by_permission_scope
diff --git a/app/models/integrations/datadog.rb b/app/models/integrations/datadog.rb
index 97e586c0662..bb0fb6b9079 100644
--- a/app/models/integrations/datadog.rb
+++ b/app/models/integrations/datadog.rb
@@ -15,75 +15,7 @@ module Integrations
 
     TAG_KEY_VALUE_RE = %r{\A [\w-]+ : .*\S.* \z}x.freeze
 
-    field :datadog_site,
-      placeholder: DEFAULT_DOMAIN,
-      help: -> do
-        ERB::Util.html_escape(
-          s_('DatadogIntegration|The Datadog site to send data to. To send data to the EU site, use %{codeOpen}datadoghq.eu%{codeClose}.')
-        ) % {
-          codeOpen: '<code>'.html_safe,
-          codeClose: '</code>'.html_safe
-        }
-      end
-
-    field :api_url,
-      title: -> { s_('DatadogIntegration|API URL') },
-      help: -> { s_('DatadogIntegration|(Advanced) The full URL for your Datadog site.') }
-
-    field :api_key,
-      type: 'password',
-      title: -> { _('API key') },
-      non_empty_password_title: -> { s_('ProjectService|Enter new API key') },
-      non_empty_password_help: -> { s_('ProjectService|Leave blank to use your current API key') },
-      help: -> do
-        ERB::Util.html_escape(
-          s_('DatadogIntegration|%{linkOpen}API key%{linkClose} used for authentication with Datadog.')
-        ) % {
-          linkOpen: %Q{<a href="#{URL_API_KEYS_DOCS}" target="_blank" rel="noopener noreferrer">}.html_safe,
-          linkClose: '</a>'.html_safe
-        }
-      end,
-      required: true
-
-    field :archive_trace_events,
-      type: 'checkbox',
-      title: -> { s_('Logs') },
-      checkbox_label: -> { s_('Enable logs collection') },
-      help: -> { s_('When enabled, job logs are collected by Datadog and displayed along with pipeline execution traces.') }
-
-    field :datadog_service,
-      title: -> { s_('DatadogIntegration|Service') },
-      placeholder: 'gitlab-ci',
-      help: -> { s_('DatadogIntegration|Tag all data from this GitLab instance in Datadog. Useful when managing several self-managed deployments.') }
-
-    field :datadog_env,
-      title: -> { s_('DatadogIntegration|Environment') },
-      placeholder: 'ci',
-      help: -> do
-        ERB::Util.html_escape(
-          s_('DatadogIntegration|For self-managed deployments, set the %{codeOpen}env%{codeClose} tag for all the data sent to Datadog. %{linkOpen}How do I use tags?%{linkClose}')
-        ) % {
-          codeOpen: '<code>'.html_safe,
-          codeClose: '</code>'.html_safe,
-          linkOpen: '<a href="https://docs.datadoghq.com/getting_started/tagging/#using-tags" target="_blank" rel="noopener noreferrer">'.html_safe,
-          linkClose: '</a>'.html_safe
-        }
-      end
-
-    field :datadog_tags,
-      type: 'textarea',
-      title: -> { s_('DatadogIntegration|Tags') },
-      placeholder: "tag:value\nanother_tag:value",
-      help: -> do
-        ERB::Util.html_escape(
-          s_('DatadogIntegration|Custom tags in Datadog. Enter one tag per line in the %{codeOpen}key:value%{codeClose} format. %{linkOpen}How do I use tags?%{linkClose}')
-        ) % {
-          codeOpen: '<code>'.html_safe,
-          codeClose: '</code>'.html_safe,
-          linkOpen: '<a href="https://docs.datadoghq.com/getting_started/tagging/#using-tags" target="_blank" rel="noopener noreferrer">'.html_safe,
-          linkClose: '</a>'.html_safe
-        }
-      end
+    prop_accessor :datadog_site, :api_url, :api_key, :datadog_service, :datadog_env, :datadog_tags
 
     before_validation :strip_properties
 
@@ -145,11 +77,92 @@ module Integrations
     end
 
     def fields
+      f = [
+        {
+          type: 'text',
+          name: 'datadog_site',
+          placeholder: DEFAULT_DOMAIN,
+          help: ERB::Util.html_escape(
+            s_('DatadogIntegration|The Datadog site to send data to. To send data to the EU site, use %{codeOpen}datadoghq.eu%{codeClose}.')
+          ) % {
+            codeOpen: '<code>'.html_safe,
+            codeClose: '</code>'.html_safe
+          },
+          required: false
+        },
+        {
+          type: 'text',
+          name: 'api_url',
+          title: s_('DatadogIntegration|API URL'),
+          help: s_('DatadogIntegration|(Advanced) The full URL for your Datadog site.'),
+          required: false
+        },
+        {
+          type: 'password',
+          name: 'api_key',
+          title: _('API key'),
+          non_empty_password_title: s_('ProjectService|Enter new API key'),
+          non_empty_password_help: s_('ProjectService|Leave blank to use your current API key'),
+          help: ERB::Util.html_escape(
+            s_('DatadogIntegration|%{linkOpen}API key%{linkClose} used for authentication with Datadog.')
+          ) % {
+            linkOpen: %Q{<a href="#{URL_API_KEYS_DOCS}" target="_blank" rel="noopener noreferrer">}.html_safe,
+            linkClose: '</a>'.html_safe
+          },
+          required: true
+        }
+      ]
+
       if Feature.enabled?(:datadog_integration_logs_collection, parent)
-        super
-      else
-        super.reject { _1.name == 'archive_trace_events' }
+        f.append({
+          type: 'checkbox',
+          name: 'archive_trace_events',
+          title: s_('Logs'),
+          checkbox_label: s_('Enable logs collection'),
+          help: s_('When enabled, job logs are collected by Datadog and displayed along with pipeline execution traces.'),
+          required: false
+        })
       end
+
+      f += [
+        {
+          type: 'text',
+          name: 'datadog_service',
+          title: s_('DatadogIntegration|Service'),
+          placeholder: 'gitlab-ci',
+          help: s_('DatadogIntegration|Tag all data from this GitLab instance in Datadog. Useful when managing several self-managed deployments.')
+        },
+        {
+          type: 'text',
+          name: 'datadog_env',
+          title: s_('DatadogIntegration|Environment'),
+          placeholder: 'ci',
+          help: ERB::Util.html_escape(
+            s_('DatadogIntegration|For self-managed deployments, set the %{codeOpen}env%{codeClose} tag for all the data sent to Datadog. %{linkOpen}How do I use tags?%{linkClose}')
+          ) % {
+            codeOpen: '<code>'.html_safe,
+            codeClose: '</code>'.html_safe,
+            linkOpen: '<a href="https://docs.datadoghq.com/getting_started/tagging/#using-tags" target="_blank" rel="noopener noreferrer">'.html_safe,
+            linkClose: '</a>'.html_safe
+          }
+        },
+        {
+          type: 'textarea',
+          name: 'datadog_tags',
+          title: s_('DatadogIntegration|Tags'),
+          placeholder: "tag:value\nanother_tag:value",
+          help: ERB::Util.html_escape(
+            s_('DatadogIntegration|Custom tags in Datadog. Enter one tag per line in the %{codeOpen}key:value%{codeClose} format. %{linkOpen}How do I use tags?%{linkClose}')
+          ) % {
+            codeOpen: '<code>'.html_safe,
+            codeClose: '</code>'.html_safe,
+            linkOpen: '<a href="https://docs.datadoghq.com/getting_started/tagging/#using-tags" target="_blank" rel="noopener noreferrer">'.html_safe,
+            linkClose: '</a>'.html_safe
+          }
+        }
+      ]
+
+      f
     end
 
     override :hook_url
diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml
index 69f765ee163..0ec32004a9a 100644
--- a/app/views/profiles/emails/index.html.haml
+++ b/app/views/profiles/emails/index.html.haml
@@ -18,7 +18,7 @@
         = f.submit _('Add email address'), class: 'gl-button btn btn-confirm', data: { qa_selector: 'add_email_address_button' }
     %hr
     %h4.gl-mt-0
-      = _('Linked emails (%{email_count})') % { email_count: @emails.load.size + 1 }
+      = _('Linked emails (%{email_count})') % { email_count: @emails.load.size }
     .account-well.gl-mb-3
       %ul
         %li
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 58db071a8d1..ae8b266c092 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -57,9 +57,9 @@
 .gl-mt-5{ class: (is_footer ? "footer-block" : "middle-block") }
   - if !issuable.persisted? && !issuable.project.empty_repo? && (guide_url = issuable.project.present.contribution_guide_path)
     .gl-mb-5
-      Please review the
-      %strong= link_to('contribution guidelines', guide_url)
-      for this project.
+      - contribution_guidelines_start = '<strong><a href="%{url}">'.html_safe % {url: strip_tags(guide_url)}
+      - contribution_guidelines_end = '</a></strong>'.html_safe
+      = sanitize(html_escape(_('Please review the %{linkStart}contribution guidelines%{linkEnd} for this project.')) % { linkStart: contribution_guidelines_start, linkEnd: contribution_guidelines_end })
 
   - if issuable.new_record?
     = form.submit "#{_('Create')} #{issuable.class.model_name.human.downcase}", class: 'gl-button btn btn-confirm gl-mr-2', data: { qa_selector: 'issuable_create_button', track_experiment: 'promote_mr_approvals_in_free', track_action: 'click_button', track_label: 'submit_mr', track_value: 0 }