Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab-ci.yml

@@ -126,22 +126,23 @@ variables:
   RUBY_VERSION: "2.7"
   GO_VERSION: "1.18"
 
-  TMP_TEST_FOLDER: "${CI_PROJECT_DIR}/tmp/tests"
-  GITLAB_WORKHORSE_FOLDER: "gitlab-workhorse"
-  TMP_TEST_GITLAB_WORKHORSE_PATH: "${TMP_TEST_FOLDER}/${GITLAB_WORKHORSE_FOLDER}"
-  KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/report-master.json
   FLAKY_RSPEC_SUITE_REPORT_PATH: rspec/flaky/report-suite.json
-  RSPEC_TESTS_MAPPING_PATH: crystalball/mapping.json
-  RSPEC_PACKED_TESTS_MAPPING_PATH: crystalball/packed-mapping.json
-  RSPEC_PROFILING_FOLDER_PATH: rspec/profiling
   FRONTEND_FIXTURES_MAPPING_PATH: crystalball/frontend_fixtures_mapping.json
-  RSPEC_CHANGED_FILES_PATH: rspec/changed_files.txt
-  RSPEC_MATCHING_TESTS_PATH: rspec/matching_tests.txt
-  RSPEC_MATCHING_TESTS_FOSS_PATH: rspec/matching_tests-foss.txt
-  RSPEC_LAST_RUN_RESULTS_FILE: rspec/rspec_last_run_results.txt
-  RSPEC_FOSS_IMPACT_PIPELINE_YML: rspec-foss-impact-pipeline.yml
+  GITLAB_WORKHORSE_FOLDER: "gitlab-workhorse"
   JUNIT_RESULT_FILE: rspec/junit_rspec.xml
   JUNIT_RETRY_FILE: rspec/junit_rspec-retry.xml
+  KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/report-master.json
+  RSPEC_CHANGED_FILES_PATH: rspec/changed_files.txt
+  RSPEC_FOSS_IMPACT_PIPELINE_YML: rspec-foss-impact-pipeline.yml
+  RSPEC_LAST_RUN_RESULTS_FILE: rspec/rspec_last_run_results.txt
+  RSPEC_MATCHING_JS_FILES_PATH: rspec/js_matching_files.txt
+  RSPEC_MATCHING_TESTS_FOSS_PATH: rspec/matching_tests-foss.txt
+  RSPEC_MATCHING_TESTS_PATH: rspec/matching_tests.txt
+  RSPEC_PACKED_TESTS_MAPPING_PATH: crystalball/packed-mapping.json
+  RSPEC_PROFILING_FOLDER_PATH: rspec/profiling
+  RSPEC_TESTS_MAPPING_PATH: crystalball/mapping.json
+  TMP_TEST_FOLDER: "${CI_PROJECT_DIR}/tmp/tests"
+  TMP_TEST_GITLAB_WORKHORSE_PATH: "${TMP_TEST_FOLDER}/${GITLAB_WORKHORSE_FOLDER}"
 
   ES_JAVA_OPTS: "-Xms256m -Xmx256m"
   ELASTIC_URL: "http://elastic:changeme@elasticsearch:9200"

.gitlab/CODEOWNERS

@@ -1438,7 +1438,6 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /**/javascripts/jobs/ @gitlab-org/ci-cd/verify/frontend
 /**/javascripts/pipelines/ @gitlab-org/ci-cd/verify/frontend
 /app/assets/javascripts/ci/ @gitlab-org/ci-cd/verify/frontend
-/app/assets/javascripts/pipeline_new/ @gitlab-org/ci-cd/verify/frontend
 /app/assets/javascripts/ci/pipeline_schedules/ @gitlab-org/ci-cd/verify/frontend
 /ee/app/assets/javascripts/ci/ @gitlab-org/ci-cd/verify/frontend
 /app/assets/javascripts/token_access/ @gitlab-org/ci-cd/verify/frontend

.gitlab/ci/frontend.gitlab-ci.yml

@@ -212,7 +212,7 @@ jest minimal:
     - !reference [jest, needs]
     - "detect-tests"
   script:
-    - if [[ -s "$RSPEC_CHANGED_FILES_PATH" ]]; then run_timed_command "yarn jest:ci:minimal"; fi
+    - if [[ -s "$RSPEC_CHANGED_FILES_PATH" ]] || [[ -s "$RSPEC_MATCHING_JS_FILES_PATH" ]]; then run_timed_command "yarn jest:ci:minimal"; fi
 
 jest as-if-foss:
   extends:
@@ -231,7 +231,7 @@ jest minimal as-if-foss:
     - "rspec-all frontend_fixture as-if-foss"
     - "detect-tests"
   script:
-    - if [[ -s "$RSPEC_CHANGED_FILES_PATH" ]]; then run_timed_command "yarn jest:ci:minimal"; fi
+    - if [[ -s "$RSPEC_CHANGED_FILES_PATH" ]] || [[ -s "$RSPEC_MATCHING_JS_FILES_PATH" ]]; then run_timed_command "yarn jest:ci:minimal"; fi
 
 jest-integration:
   extends:

.gitlab/ci/setup.gitlab-ci.yml

@@ -137,17 +137,20 @@ detect-tests:
         tooling/bin/find_tests ${RSPEC_CHANGED_FILES_PATH} ${RSPEC_MATCHING_TESTS_PATH};
         tooling/bin/find_changes ${RSPEC_CHANGED_FILES_PATH} ${RSPEC_MATCHING_TESTS_PATH} ${FRONTEND_FIXTURES_MAPPING_PATH};
         filter_rspec_matched_foss_tests ${RSPEC_MATCHING_TESTS_PATH} ${RSPEC_MATCHING_TESTS_FOSS_PATH};
+        tooling/bin/view_to_js_mappings ${RSPEC_CHANGED_FILES_PATH} ${RSPEC_MATCHING_JS_FILES_PATH};
         echoinfo "Changed files: $(cat $RSPEC_CHANGED_FILES_PATH)";
         echoinfo "Related RSpec tests: $(cat $RSPEC_MATCHING_TESTS_PATH)";
         echoinfo "Related FOSS RSpec tests: $(cat $RSPEC_MATCHING_TESTS_FOSS_PATH)";
+        echoinfo "Related JS files: $(cat $RSPEC_MATCHING_JS_FILES_PATH)";
       fi
   artifacts:
     expire_in: 7d
     paths:
+      - ${FRONTEND_FIXTURES_MAPPING_PATH}
       - ${RSPEC_CHANGED_FILES_PATH}
-      - ${RSPEC_MATCHING_TESTS_PATH}
+      - ${RSPEC_MATCHING_JS_FILES_PATH}
       - ${RSPEC_MATCHING_TESTS_FOSS_PATH}
-      - ${FRONTEND_FIXTURES_MAPPING_PATH}
+      - ${RSPEC_MATCHING_TESTS_PATH}
 
 detect-previous-failed-tests:
   extends:

.rubocop_todo/layout/line_length.yml

@@ -43,7 +43,6 @@ Layout/LineLength:
     - 'app/controllers/groups/settings/integrations_controller.rb'
     - 'app/controllers/groups/settings/repository_controller.rb'
     - 'app/controllers/groups_controller.rb'
-    - 'app/controllers/import/available_namespaces_controller.rb'
     - 'app/controllers/import/base_controller.rb'
     - 'app/controllers/import/bitbucket_controller.rb'
     - 'app/controllers/import/bitbucket_server_controller.rb'
@@ -3672,7 +3671,6 @@ Layout/LineLength:
     - 'spec/controllers/groups/settings/applications_controller_spec.rb'
     - 'spec/controllers/groups/settings/integrations_controller_spec.rb'
     - 'spec/controllers/groups_controller_spec.rb'
-    - 'spec/controllers/import/available_namespaces_controller_spec.rb'
     - 'spec/controllers/import/bitbucket_controller_spec.rb'
     - 'spec/controllers/import/bitbucket_server_controller_spec.rb'
     - 'spec/controllers/import/bulk_imports_controller_spec.rb'

.rubocop_todo/performance/string_identifier_argument.yml

@@ -78,7 +78,6 @@ Style/ClassAndModuleChildren:
     - 'app/controllers/groups/milestones_controller.rb'
     - 'app/controllers/groups/runners_controller.rb'
     - 'app/controllers/groups/uploads_controller.rb'
-    - 'app/controllers/import/available_namespaces_controller.rb'
     - 'app/controllers/import/base_controller.rb'
     - 'app/controllers/import/bitbucket_controller.rb'
     - 'app/controllers/import/bitbucket_server_controller.rb'

.rubocop_todo/style/class_and_module_children.yml

@@ -71,7 +71,7 @@ export default {
       timezone: this.cronTimezone,
       formCiVariables: {},
       // TODO: Add the GraphQL query to help populate the predefined variables
-      // app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue#131
+      // app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue#131
       predefinedValueOptions: {},
     };
   },

app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue

@@ -1,3 +1,3 @@
-import initNewPipelineForm from '~/pipeline_new/index';
+import initNewPipelineForm from '~/ci/pipeline_new/index';
 
 initNewPipelineForm();

app/assets/javascripts/pipeline_new/components/refs_dropdown.vue app/assets/javascripts/ci/pipeline_new/components/refs_dropdown.vue

@@ -256,7 +256,7 @@ def authorize_create_group!
 
   def determine_layout
     if [:new, :create].include?(action_name.to_sym)
-      'application'
+      'dashboard'
     elsif [:edit, :update, :projects].include?(action_name.to_sym)
       'group_settings'
     else

app/assets/javascripts/pipeline_new/constants.js app/assets/javascripts/ci/pipeline_new/constants.js

@@ -303,7 +303,7 @@ def authorize_update_environment!
   def append_info_to_payload(payload)
     super
 
-    return unless Feature.enabled?(:environments_search_logging) && params[:search]
+    return unless Feature.enabled?(:environments_search_logging) && params[:search].present?
 
     # Merging to :metadata will ensure these are logged as top level keys
     payload[:metadata] ||= {}

app/assets/javascripts/pipeline_new/graphql/mutations/create_pipeline.mutation.graphql app/assets/javascripts/ci/pipeline_new/graphql/mutations/create_pipeline.mutation.graphql

@@ -13,7 +13,7 @@ module ObservabilityHelper
       },
       'explore' => {
         path: '/explore',
-        title: -> { s_('Observability|Explore') }
+        title: -> { s_('Observability|Explore telemetry data') }
       },
       'datasources' => {
         path: '/datasources',

app/assets/javascripts/pipeline_new/graphql/queries/ci_config_variables.graphql app/assets/javascripts/ci/pipeline_new/graphql/queries/ci_config_variables.graphql

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Emails
+  module Imports
+    def github_gists_import_errors_email(user_id, errors)
+      @errors = errors
+      user = User.find(user_id)
+
+      email_with_layout(
+        to: user.notification_email_or_default,
+        subject: subject(s_('GithubImporter|GitHub Gists import finished with errors'))
+      )
+    end
+  end
+end

app/assets/javascripts/pipeline_new/graphql/resolvers.js app/assets/javascripts/ci/pipeline_new/graphql/resolvers.js

@@ -24,6 +24,7 @@ class Notify < ApplicationMailer
   include Emails::InProductMarketing
   include Emails::AdminNotification
   include Emails::IdentityVerification
+  include Emails::Imports
 
   helper TimeboxesHelper
   helper MergeRequestsHelper

app/assets/javascripts/pipeline_new/index.js app/assets/javascripts/ci/pipeline_new/index.js

@@ -225,6 +225,10 @@ def project_was_moved_email
     Notify.project_was_moved_email(project.id, user.id, "gitlab/gitlab").message
   end
 
+  def github_gists_import_errors_email
+    Notify.github_gists_import_errors_email(user.id, { '12345' => 'Snippet maximum file count exceeded', '67890' => 'error message 2' }).message
+  end
+
   private
 
   def project

app/assets/javascripts/pipeline_new/utils/filter_variables.js app/assets/javascripts/ci/pipeline_new/utils/filter_variables.js

@@ -15,9 +15,9 @@ class AbuseReport < ApplicationRecord
   validates :category, presence: true
   validates :user_id,
     uniqueness: {
-      scope: :reporter_id,
+      scope: [:reporter_id, :category],
       message: ->(object, data) do
-        _('has already been reported for abuse')
+        _('You have already reported this user')
       end
     }
 

app/assets/javascripts/pipeline_new/utils/format_refs.js app/assets/javascripts/ci/pipeline_new/utils/format_refs.js

@@ -3,7 +3,7 @@
 module Security
   module CiConfiguration
     class BaseCreateService
-      attr_reader :branch_name, :current_user, :project
+      attr_reader :branch_name, :current_user, :project, :name
 
       def initialize(project, current_user)
         @project = project
@@ -41,8 +41,18 @@ def attributes
       end
 
       def existing_gitlab_ci_content
-        @gitlab_ci_yml ||= project.ci_config_for(project.repository.root_ref_sha)
+        root_ref = root_ref_sha(project)
+        return if root_ref.nil?
+
+        @gitlab_ci_yml ||= project.ci_config_for(root_ref)
         YAML.safe_load(@gitlab_ci_yml) if @gitlab_ci_yml
+      rescue Psych::BadAlias
+        raise Gitlab::Graphql::Errors::MutationError,
+              ".gitlab-ci.yml with aliases/anchors is not supported. Please change the CI configuration manually."
+      rescue Psych::Exception => e
+        Gitlab::AppLogger.error("Failed to process existing .gitlab-ci.yml: #{e.message}")
+        raise Gitlab::Graphql::Errors::MutationError,
+              "#{name} merge request creation mutation failed"
       end
 
       def successful_change_path
@@ -61,6 +71,15 @@ def track_event(attributes_for_commit)
           self.class.to_s, action[:action], label: action[:default_values_overwritten].to_s
         )
       end
+
+      def root_ref_sha(project)
+        project.repository.root_ref_sha
+      rescue StandardError => e
+        # this might fail on the very first commit,
+        # and unfortunately it raises a StandardError
+        Gitlab::ErrorTracking.track_exception(e, project_id: project.id)
+        nil
+      end
     end
   end
 end

app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_form.vue

@@ -21,6 +21,10 @@ def message
       def description
         _('Configure Container Scanning in `.gitlab-ci.yml` using the GitLab managed template. You can [add variable overrides](https://docs.gitlab.com/ee/user/application_security/container_scanning/#customizing-the-container-scanning-settings) to customize Container Scanning settings.')
       end
+
+      def name
+        'Container Scanning'
+      end
     end
   end
 end

app/assets/javascripts/pages/projects/pipelines/new/index.js

@@ -21,6 +21,10 @@ def message
       def description
         _('Configure Dependency Scanning in `.gitlab-ci.yml` using the GitLab managed template. You can [add variable overrides](https://docs.gitlab.com/ee/user/application_security/dependency_scanning/#customizing-the-dependency-scanning-settings) to customize Dependency Scanning settings.')
       end
+
+      def name
+        'Dependency Scanning'
+      end
     end
   end
 end

app/controllers/groups_controller.rb

@@ -20,13 +20,7 @@ def remove_branch_on_exception
       end
 
       def action
-        existing_content = begin
-          existing_gitlab_ci_content # this can fail on the very first commit
-        rescue StandardError
-          nil
-        end
-
-        Security::CiConfiguration::SastBuildAction.new(project.auto_devops_enabled?, params, existing_content, project.ci_config_path).generate
+        Security::CiConfiguration::SastBuildAction.new(project.auto_devops_enabled?, params, existing_gitlab_ci_content, project.ci_config_path).generate
       end
 
       def next_branch
@@ -40,6 +34,10 @@ def message
       def description
         _('Configure SAST in `.gitlab-ci.yml` using the GitLab managed template. You can [add variable overrides](https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings) to customize SAST settings.')
       end
+
+      def name
+        'SAST'
+      end
     end
   end
 end

app/controllers/import/available_namespaces_controller.rb

@@ -21,6 +21,10 @@ def message
       def description
         _('Configure SAST IaC in `.gitlab-ci.yml` using the GitLab managed template. You can [add variable overrides](https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings) to customize SAST IaC settings.')
       end
+
+      def name
+        'SAST IaC'
+      end
     end
   end
 end

app/controllers/projects/environments_controller.rb

@@ -21,6 +21,10 @@ def message
       def description
         _('Configure Secret Detection in `.gitlab-ci.yml` using the GitLab managed template. You can [add variable overrides](https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings) to customize Secret Detection settings.')
       end
+
+      def name
+        'Secret Detection'
+      end
     end
   end
 end

app/helpers/groups/observability_helper.rb

@@ -0,0 +1,19 @@
+- text_style = 'font-size:16px; text-align:center;  line-height:30px;'
+
+%p{ style: text_style }
+  = s_('GithubImporter|Your import of GitHub gists into GitLab snippets is complete.')
+
+%p
+  = s_('GithubImporter|GitHub gists that were not imported:')
+
+  %ol
+  - @errors.each do |gist_id, error|
+    %li
+      = s_("GithubImporter|Gist with id %{gist_id} failed due to error: %{error}.") % { gist_id: gist_id, error: error }
+      - if error == Gitlab::GithubGistsImport::Importer::GistImporter::FILE_COUNT_LIMIT_MESSAGE
+        - import_snippets_url = help_page_url('api/import.md', anchor: 'import-github-gists-into-gitlab-snippets')
+        - import_snippets_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: import_snippets_url }
+        = html_escape(s_("GithubImporter|Please follow %{import_snippets_link_start}Import GitHub gists into GitLab snippets%{import_snippets_link_end} for more details.")) % { import_snippets_link_start: import_snippets_link_start, import_snippets_link_end: '</a>'.html_safe }
+
+%p
+  = s_('GithubImporter|GitHub gists with more than 10 files must be manually migrated.')

app/mailers/emails/imports.rb

@@ -0,0 +1,12 @@
+<%= s_('GithubImporter|Your import of GitHub gists into GitLab snippets is complete.') %>
+
+<%= s_('GithubImporter|GitHub gists that were not imported:') %>
+<% @errors.each do |gist_id, error| %>
+  - <%= s_("GithubImporter|Gist with id %{gist_id} failed due to error: %{error}.") % { gist_id: gist_id, error: error } %>
+  <% if error == Gitlab::GithubGistsImport::Importer::GistImporter::FILE_COUNT_LIMIT_MESSAGE %>
+    <% import_snippets_url = help_page_url('api/import.md', anchor: 'import-github-gists-into-gitlab-snippets') %>
+    <%= s_("GithubImporter|Please follow %{import_snippets_url} for more details.") % { import_snippets_url: import_snippets_url } %>
+  <% end %>
+<% end %>
+
+<%= s_('GithubImporter|GitHub gists with more than 10 files must be manually migrated.') %>