Automatic merge of gitlab-org/gitlab master

app/views/projects/_new_project_fields.html.haml

@@ -64,43 +64,13 @@
 
   - experiment(:new_project_sast_enabled, user: current_user) do |e|
     - e.try(:candidate) do
-      .form-group
-        .form-check.gl-mb-3
-          = check_box_tag 'project[initialize_with_sast]', '1', true, class: 'form-check-input', data: { qa_selector: 'initialize_with_sast_checkbox', track_experiment: e.name, track_label: track_label, track_action: 'activate_form_input', track_property: 'init_with_sast' }
-          = label_tag 'project[initialize_with_sast]', class: 'form-check-label' do
-            = s_('ProjectsNew|Enable Static Application Security Testing (SAST)')
-          .form-text.text-muted
-            = s_('ProjectsNew|Analyze your source code for known security vulnerabilities.')
-            = link_to _('Learn more.'), help_page_path('user/application_security/sast/index'), target: '_blank', rel: 'noopener noreferrer', data: { track_action: 'followed', track_experiment: e.name }
+      = render 'new_project_initialize_with_sast', experiment_name: e.name, track_label: track_label, checked: true, with_free_badge: false
     - e.try(:unchecked_candidate) do
-      .form-group
-        .form-check.gl-mb-3
-          = check_box_tag 'project[initialize_with_sast]', '1', false, class: 'form-check-input', data: { qa_selector: 'initialize_with_sast_checkbox', track_experiment: e.name, track_label: track_label, track_action: 'activate_form_input', track_property: 'init_with_sast' }
-          = label_tag 'project[initialize_with_sast]', class: 'form-check-label' do
-            = s_('ProjectsNew|Enable Static Application Security Testing (SAST)')
-          .form-text.text-muted
-            = s_('ProjectsNew|Analyze your source code for known security vulnerabilities.')
-            = link_to _('Learn more.'), help_page_path('user/application_security/sast/index'), target: '_blank', rel: 'noopener noreferrer', data: { track_action: 'followed', track_experiment: e.name }
+      = render 'new_project_initialize_with_sast', experiment_name: e.name, track_label: track_label, checked: false, with_free_badge: false
     - e.try(:free_indicator) do
-      .form-group
-        .form-check.gl-mb-3
-          = check_box_tag 'project[initialize_with_sast]', '1', true, class: 'form-check-input', data: { qa_selector: 'initialize_with_sast_checkbox', track_experiment: e.name, track_label: track_label, track_action: 'activate_form_input', track_property: 'init_with_sast' }
-          = label_tag 'project[initialize_with_sast]', class: 'form-check-label' do
-            = s_('ProjectsNew|Enable Static Application Security Testing (SAST)')
-            = gl_badge_tag _('Free'), variant: :info, size: :sm
-          .form-text.text-muted
-            = s_('ProjectsNew|Analyze your source code for known security vulnerabilities.')
-            = link_to _('Learn more.'), help_page_path('user/application_security/sast/index'), target: '_blank', rel: 'noopener noreferrer', data: { track_action: 'followed', track_experiment: e.name }
+      = render 'new_project_initialize_with_sast', experiment_name: e.name, track_label: track_label, checked: true, with_free_badge: true
     - e.try(:unchecked_free_indicator) do
-      .form-group
-        .form-check.gl-mb-3
-          = check_box_tag 'project[initialize_with_sast]', '1', false, class: 'form-check-input', data: { qa_selector: 'initialize_with_sast_checkbox', track_experiment: e.name, track_label: track_label, track_action: 'activate_form_input', track_property: 'init_with_sast' }
-          = label_tag 'project[initialize_with_sast]', class: 'form-check-label' do
-            = s_('ProjectsNew|Enable Static Application Security Testing (SAST)')
-            = gl_badge_tag _('Free'), variant: :info, size: :sm
-          .form-text.text-muted
-            = s_('ProjectsNew|Analyze your source code for known security vulnerabilities.')
-            = link_to _('Learn more.'), help_page_path('user/application_security/sast/index'), target: '_blank', rel: 'noopener noreferrer', data: { track_action: 'followed', track_experiment: e.name }
+      = render 'new_project_initialize_with_sast', experiment_name: e.name, track_label: track_label, checked: false, with_free_badge: true
 
 = f.submit _('Create project'), class: "btn gl-button btn-confirm", data: { track_label: "#{track_label}", track_action: "click_button", track_property: "create_project", track_value: "" }
 = link_to _('Cancel'), dashboard_projects_path, class: 'btn gl-button btn-default btn-cancel', data: { track_label: "#{track_label}", track_action: "click_button", track_property: "cancel", track_value: "" }

app/views/projects/_new_project_initialize_with_sast.html.haml

+- experiment_name = local_assigns.fetch(:experiment_name)
+- track_label = local_assigns.fetch(:track_label)
+
+- with_free_badge = local_assigns.fetch(:with_free_badge, false)
+- checked = local_assigns.fetch(:checked, false)
+
+.form-group
+  .form-check.gl-mb-3
+    = check_box_tag 'project[initialize_with_sast]', '1', checked, class: 'form-check-input', data: { qa_selector: 'initialize_with_sast_checkbox', track_experiment: experiment_name, track_label: track_label, track_action: 'activate_form_input', track_property: 'init_with_sast' }
+    = label_tag 'project[initialize_with_sast]', class: 'form-check-label' do
+      = s_('ProjectsNew|Enable Static Application Security Testing (SAST)')
+      - if with_free_badge
+        = gl_badge_tag _('Free'), variant: :info, size: :sm
+    .form-text.text-muted
+      = s_('ProjectsNew|Analyze your source code for known security vulnerabilities.')
+      = link_to _('Learn more.'), help_page_path('user/application_security/sast/index'), target: '_blank', rel: 'noopener noreferrer', data: { track_action: 'followed', track_experiment: experiment_name }

db/post_migrate/20220201034731_remove_index_clusters_kubernetes_namespaces_on_cluster_id.rb

+# frozen_string_literal: true
+
+class RemoveIndexClustersKubernetesNamespacesOnClusterId < Gitlab::Database::Migration[1.0]
+  INDEX = 'index_clusters_kubernetes_namespaces_on_cluster_id'
+
+  disable_ddl_transaction!
+
+  def up
+    remove_concurrent_index_by_name :clusters_kubernetes_namespaces, INDEX
+  end
+
+  def down
+    add_concurrent_index :clusters_kubernetes_namespaces, :cluster_id, name: INDEX
+  end
+end

db/schema_migrations/20220201034731

+873ff811d4f70c012785297ee8c07eb496994af69d5ae4b266e8f675c88daca4
\ No newline at end of file

db/structure.sql

@@ -25993,8 +25993,6 @@ CREATE INDEX index_clusters_integration_elasticstack_enabled ON clusters_integra
 
 CREATE INDEX index_clusters_integration_prometheus_enabled ON clusters_integration_prometheus USING btree (enabled, created_at, cluster_id);
 
-CREATE INDEX index_clusters_kubernetes_namespaces_on_cluster_id ON clusters_kubernetes_namespaces USING btree (cluster_id);
-
 CREATE INDEX index_clusters_kubernetes_namespaces_on_cluster_project_id ON clusters_kubernetes_namespaces USING btree (cluster_project_id);
 
 CREATE INDEX index_clusters_kubernetes_namespaces_on_environment_id ON clusters_kubernetes_namespaces USING btree (environment_id);

doc/user/project/integrations/webex_teams.md

@@ -13,7 +13,7 @@ You can configure GitLab to send notifications to a Webex Teams space:
 
 ## Create a webhook for the space
 
-1. Go to the [Incoming Webhooks app page](https://apphub.webex.com/applications/incoming-webhooks-cisco-systems-38054).
+1. Go to the [Incoming Webhooks app page](https://apphub.webex.com/applications/incoming-webhooks-cisco-systems-38054-23307).
 1. Select **Connect** and log in to Webex Teams, if required.
 1. Enter a name for the webhook and select the space to receive the notifications.
 1. Select **ADD**.

ee/app/views/projects/services/gitlab_slack_application/_slack_integration_form.html.haml

@@ -23,7 +23,7 @@
         .controls
           - project = integration.project
           = link_to _('Edit'), edit_project_settings_slack_path(project), class: 'btn gl-button btn-default'
-          = link_to sprite_icon('remove', css_class: 'gl-icon'), project_settings_slack_path(project), method: :delete, class: 'btn gl-button btn-danger btn-danger-secondary', data: { confirm: 'Are you sure?' }
+          = link_to sprite_icon('remove', css_class: 'gl-icon'), project_settings_slack_path(project), method: :delete, class: 'btn gl-button btn-danger btn-danger-secondary', aria: { label: s_('SlackIntegration|Remove project') }, data: { confirm_btn_variant: "danger", confirm: s_('SlackIntegration|Are you sure you want to remove this project from the Slack application?') }
 - else
   %p= s_('SlackIntegration|To set up this integration press "Add to Slack"')
   = render "projects/services/#{integration.to_param}/slack_button", project: @project

lib/gitlab/i18n.rb

@@ -43,29 +43,29 @@ module Gitlab
     TRANSLATION_LEVELS = {
       'bg' => 0,
       'cs_CZ' => 0,
-      'da_DK' => 49,
+      'da_DK' => 48,
       'de' => 15,
       'en' => 100,
       'eo' => 0,
-      'es' => 38,
+      'es' => 39,
       'fil_PH' => 0,
       'fr' => 11,
       'gl_ES' => 0,
       'id_ID' => 0,
       'it' => 2,
-      'ja' => 36,
-      'ko' => 12,
-      'nb_NO' => 32,
+      'ja' => 35,
+      'ko' => 13,
+      'nb_NO' => 31,
       'nl_NL' => 0,
-      'pl_PL' => 5,
+      'pl_PL' => 4,
       'pt_BR' => 50,
       'ro_RO' => 22,
-      'ru' => 26,
+      'ru' => 32,
       'tr_TR' => 14,
-      'uk' => 45,
-      'zh_CN' => 98,
+      'uk' => 44,
+      'zh_CN' => 96,
       'zh_HK' => 2,
-      'zh_TW' => 3
+      'zh_TW' => 2
     }.freeze
     private_constant :TRANSLATION_LEVELS
 

locale/gitlab.pot

@@ -33441,6 +33441,9 @@ msgstr ""
 msgid "Slack logo"
 msgstr ""
 
+msgid "SlackIntegration|Are you sure you want to remove this project from the Slack application?"
+msgstr ""
+
 msgid "SlackIntegration|GitLab for Slack"
 msgstr ""
 
@@ -33450,6 +33453,9 @@ msgstr ""
 msgid "SlackIntegration|Project alias"
 msgstr ""
 
+msgid "SlackIntegration|Remove project"
+msgstr ""
+
 msgid "SlackIntegration|Select a GitLab project to link with your Slack workspace."
 msgstr ""
 

qa/qa/page/project/new.rb

@@ -13,7 +13,6 @@ module QA
 
         view 'app/views/projects/_new_project_fields.html.haml' do
           element :initialize_with_readme_checkbox
-          element :initialize_with_sast_checkbox
           element :project_name, 'text_field :name' # rubocop:disable QA/ElementWithPattern
           element :project_path, 'text_field :path' # rubocop:disable QA/ElementWithPattern
           element :project_description, 'text_area :description' # rubocop:disable QA/ElementWithPattern
@@ -21,6 +20,10 @@ module QA
           element :visibility_radios, 'visibility_level:' # rubocop:disable QA/ElementWithPattern
         end
 
+        view 'app/views/projects/_new_project_initialize_with_sast.html.haml' do
+          element :initialize_with_sast_checkbox
+        end
+
         view 'app/views/projects/project_templates/_template.html.haml' do
           element :use_template_button
           element :template_option_row