Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

README.md

@@ -82,7 +82,7 @@ Instructions on how to start GitLab and how to run the tests can be found in the
 GitLab is a Ruby on Rails application that runs on the following software:
 
 - Ubuntu/Debian/CentOS/RHEL/OpenSUSE
-- Ruby (MRI) 2.7.5
+- Ruby (MRI) 2.7.7
 - Git 2.33+
 - Redis 5.0+
 - PostgreSQL 12+

app/assets/javascripts/diffs/components/tree_list.vue

@@ -2,6 +2,7 @@
 import { GlTooltipDirective, GlIcon } from '@gitlab/ui';
 import { mapActions, mapGetters, mapState } from 'vuex';
 import micromatch from 'micromatch';
+import { MODIFIER_KEY } from '~/constants';
 import { s__, sprintf } from '~/locale';
 import FileTree from '~/vue_shared/components/file_tree.vue';
 import DiffFileRow from './diff_file_row.vue';
@@ -65,8 +66,8 @@ export default {
       this.search = '';
     },
   },
-  searchPlaceholder: sprintf(s__('MergeRequest|Search (e.g. *.vue) (%{modifier_key}P)'), {
-    modifier_key: /Mac/i.test(navigator.userAgent) ? '⌘' : 'Ctrl+',
+  searchPlaceholder: sprintf(s__('MergeRequest|Search (e.g. *.vue) (%{MODIFIER_KEY}P)'), {
+    MODIFIER_KEY,
   }),
   DiffFileRow,
 };

app/assets/javascripts/pages/projects/compare/show/index.js

@@ -2,10 +2,13 @@ import Diff from '~/diff';
 import GpgBadges from '~/gpg_badges';
 import { initDiffStatsDropdown } from '~/init_diff_stats_dropdown';
 import initCompareSelector from '~/projects/compare';
+import syntaxHighlight from '~/syntax_highlight';
 
 initCompareSelector();
 
 new Diff(); // eslint-disable-line no-new
 const paddingTop = 16;
 initDiffStatsDropdown(document.querySelector('.navbar-gitlab').offsetHeight - paddingTop);
 GpgBadges.fetch();
+
+syntaxHighlight([document.querySelector('.files')]);

app/models/commit_collection.rb

@@ -25,7 +25,7 @@ def each(&block)
   end
 
   def committers
-    emails = without_merge_commits.map(&:committer_email).uniq
+    emails = without_merge_commits.filter_map(&:committer_email).uniq
 
     User.by_any_email(emails)
   end

app/models/integrations/flowdock.rb

@@ -193,6 +193,12 @@ def self.available_state_names
       merge_request.merge_error = nil
     end
 
+    before_transition any => :merged do |merge_request|
+      if ::Feature.enabled?(:reset_merge_error_on_transition, merge_request.project)
+        merge_request.merge_error = nil
+      end
+    end
+
     after_transition any => :opened do |merge_request|
       merge_request.run_after_commit do
         UpdateHeadPipelineForMergeRequestWorker.perform_async(merge_request.id)

app/models/merge_request.rb

@@ -1,8 +1,8 @@
 ---
-name: ci_refactoring_external_mapper
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106408
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385179
-milestone: '15.7'
+name: reset_merge_error_on_transition
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106942
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385859
+milestone: '15.8'
 type: development
-group: group::pipeline authoring
+group: group::code review
 default_enabled: false

config/feature_flags/development/ci_refactoring_external_mapper.yml config/feature_flags/development/reset_merge_error_on_transition.yml

@@ -0,0 +1,14 @@
+---
+# Warning: gitlab.GitLabFlavoredMarkdown
+#
+# Checks for unclear use of GLFM or GLM instead of GitLab/GitHub Flavored Markdown
+#
+# For a list of all options, see https://vale.sh/docs/topics/styles/
+extends: substitution
+message: "Use '%s' instead of '%s' when possible."
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/word_list.html
+level: warning
+ignorecase: true
+swap:
+  GLFM: "GitLab Flavored Markdown"
+  GFM: "GitLab Flavored Markdown' or 'GitHub Flavored Markdown"

doc/.vale/gitlab/GitLabFlavoredMarkdown.yml

@@ -26,8 +26,6 @@ swap:
   ex: "for example"
   file name: "filename"
   filesystem: "file system"
-  GLFM: "GitLab Flavored Markdown"
-  GFM: "GitLab Flavored Markdown' or 'GitHub Flavored Markdown"
   info: "information"
   it is recommended: "you should"
   n/a: "not applicable"

doc/.vale/gitlab/SubstitutionWarning.yml

@@ -652,7 +652,7 @@ Supported attributes:
 | `latest_build_finished_at` | datetime | Timestamp of when the latest build for the merge request finished. |
 | `latest_build_started_at` | datetime | Timestamp of when the latest build for the merge request started. |
 | `merge_commit_sha` | string | SHA of the merge request commit. Returns `null` until merged. |
-| `merge_error` | string | Error message due to a merge error. |
+| `merge_error` | string | Error message shown when a merge has failed. To check mergeability, use `detailed_merge_status` instead  |
 | `merge_user` | object | The user who merged this merge request, the user who set it to merge when pipeline succeeds, or `null`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/349031) in GitLab 14.7. |
 | `merge_status` | string | Status of the merge request. Can be `unchecked`, `checking`, `can_be_merged`, `cannot_be_merged`, or `cannot_be_merged_recheck`. Affects the `has_conflicts` property. For important notes on response data, read [Single merge request response notes](#single-merge-request-response-notes). [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/3169#note_1162532204) in GitLab 15.6. Use `detailed_merge_status` instead. |
 | `merge_when_pipeline_succeeds` | boolean | Indicates if the merge has been set to be merged when its pipeline succeeds. |

doc/api/merge_requests.md

@@ -637,13 +637,12 @@ test:
     - pwd
 ```
 
-The `GIT_CLONE_PATH` has to always be within `$CI_BUILDS_DIR`. The directory set in `$CI_BUILDS_DIR`
+The `GIT_CLONE_PATH` must always be within `$CI_BUILDS_DIR`. The directory set in `$CI_BUILDS_DIR`
 is dependent on executor and configuration of [runners.builds_dir](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section)
 setting.
 
 This can only be used when `custom_build_dir` is enabled in the
 [runner's configuration](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runnerscustom_build_dir-section).
-This is the default configuration for the `docker` and `kubernetes` executors.
 
 #### Handling concurrency
 

doc/ci/runners/configure_runners.md

@@ -4,6 +4,8 @@ group: Editor
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
+<!-- vale gitlab.GitLabFlavoredMarkdown = NO -->
+
 # GitLab Flavored Markdown (GLFM) developer documentation **(FREE)**
 
 This page contains the MVC for the developer documentation for GitLab Flavored Markdown (GLFM).

doc/development/gitlab_flavored_markdown/index.md

@@ -4,6 +4,8 @@ group: Editor
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
+<!-- vale gitlab.GitLabFlavoredMarkdown = NO -->
+
 # GitLab Flavored Markdown (GLFM) Specification Guide **(FREE)**
 
 ## Summary

doc/development/gitlab_flavored_markdown/specification_guide/index.md

@@ -47,7 +47,6 @@ def to_hash
             end
 
             def validate!
-              context.check_execution_time! if ::Feature.disabled?(:ci_refactoring_external_mapper, context.project)
               validate_location!
               validate_context! if valid?
               fetch_and_validate_content! if valid?

lib/gitlab/ci/config/external/file/base.rb

@@ -7,18 +7,6 @@ module External
         class Mapper
           include Gitlab::Utils::StrongMemoize
 
-          # Will be removed with FF ci_refactoring_external_mapper
-          FILE_CLASSES = [
-            External::File::Local,
-            External::File::Project,
-            External::File::Remote,
-            External::File::Template,
-            External::File::Artifact
-          ].freeze
-
-          # Will be removed with FF ci_refactoring_external_mapper
-          FILE_SUBKEYS = FILE_CLASSES.map { |f| f.name.demodulize.downcase }.freeze
-
           Error = Class.new(StandardError)
           AmbigiousSpecificationError = Class.new(Error)
           TooManyIncludesError = Class.new(Error)
@@ -32,11 +20,7 @@ def process
             return [] if @locations.empty?
 
             context.logger.instrument(:config_mapper_process) do
-              if ::Feature.enabled?(:ci_refactoring_external_mapper, context.project)
-                process_without_instrumentation
-              else
-                legacy_process_without_instrumentation
-              end
+              process_without_instrumentation
             end
           end
 
@@ -57,138 +41,6 @@ def process_without_instrumentation
 
             files
           end
-
-          # This and the following methods will be removed with FF ci_refactoring_external_mapper
-          def legacy_process_without_instrumentation
-            @locations
-              .map(&method(:normalize_location))
-              .filter_map(&method(:verify_rules))
-              .flat_map(&method(:expand_project_files))
-              .flat_map(&method(:expand_wildcard_paths))
-              .map(&method(:expand_variables))
-              .map(&method(:select_first_matching))
-              .each(&method(:verify!))
-          end
-
-          # convert location if String to canonical form
-          def normalize_location(location)
-            if location.is_a?(String)
-              expanded_location = expand_variables(location)
-              normalize_location_string(expanded_location)
-            else
-              location.deep_symbolize_keys
-            end
-          end
-
-          def verify_rules(location)
-            logger.instrument(:config_mapper_rules) do
-              verify_rules_without_instrumentation(location)
-            end
-          end
-
-          def verify_rules_without_instrumentation(location)
-            return unless Rules.new(location[:rules]).evaluate(context).pass?
-
-            location
-          end
-
-          def expand_project_files(location)
-            return location unless location[:project]
-
-            Array.wrap(location[:file]).map do |file|
-              location.merge(file: file)
-            end
-          end
-
-          def expand_wildcard_paths(location)
-            logger.instrument(:config_mapper_wildcards) do
-              expand_wildcard_paths_without_instrumentation(location)
-            end
-          end
-
-          def expand_wildcard_paths_without_instrumentation(location)
-            # We only support local files for wildcard paths
-            return location unless location[:local] && location[:local].include?('*')
-
-            context.project.repository.search_files_by_wildcard_path(location[:local], context.sha).map do |path|
-              { local: path }
-            end
-          end
-
-          def normalize_location_string(location)
-            if ::Gitlab::UrlSanitizer.valid?(location)
-              { remote: location }
-            else
-              { local: location }
-            end
-          end
-
-          def select_first_matching(location)
-            logger.instrument(:config_mapper_select) do
-              select_first_matching_without_instrumentation(location)
-            end
-          end
-
-          def select_first_matching_without_instrumentation(location)
-            matching = FILE_CLASSES.map do |file_class|
-              file_class.new(location, context)
-            end.select(&:matching?)
-
-            if matching.one?
-              matching.first
-            elsif matching.empty?
-              raise AmbigiousSpecificationError, "`#{masked_location(location.to_json)}` does not have a valid subkey for include. Valid subkeys are: `#{FILE_SUBKEYS.join('`, `')}`"
-            else
-              raise AmbigiousSpecificationError, "Each include must use only one of: `#{FILE_SUBKEYS.join('`, `')}`"
-            end
-          end
-
-          def verify!(location_object)
-            verify_max_includes!
-            location_object.validate!
-            expandset.add(location_object)
-          end
-
-          def verify_max_includes!
-            if expandset.count >= context.max_includes
-              raise TooManyIncludesError, "Maximum of #{context.max_includes} nested includes are allowed!"
-            end
-          end
-
-          def expand_variables(data)
-            logger.instrument(:config_mapper_variables) do
-              expand_variables_without_instrumentation(data)
-            end
-          end
-
-          def expand_variables_without_instrumentation(data)
-            if data.is_a?(String)
-              expand(data)
-            else
-              transform(data)
-            end
-          end
-
-          def transform(data)
-            data.transform_values do |values|
-              case values
-              when Array
-                values.map { |value| expand(value.to_s) }
-              when String
-                expand(values)
-              else
-                values
-              end
-            end
-          end
-
-          def expand(data)
-            ExpandVariables.expand(data, -> { context.variables_hash })
-          end
-
-          def masked_location(location)
-            context.mask_variables_from(location)
-          end
         end
       end
     end

lib/gitlab/ci/config/external/mapper.rb

@@ -26235,7 +26235,7 @@ msgstr ""
 msgid "MergeRequest|No files found"
 msgstr ""
 
-msgid "MergeRequest|Search (e.g. *.vue) (%{modifier_key}P)"
+msgid "MergeRequest|Search (e.g. *.vue) (%{MODIFIER_KEY}P)"
 msgstr ""
 
 msgid "MergeTopics|%{sourceTopic} will be removed"

locale/gitlab.pot

@@ -86,6 +86,12 @@ module QA
             raise
           end.not_to raise_error
         end
+
+        after do
+          parent_group_user.remove_via_api!
+          sub_group_project.remove_via_api!
+          sub_group.remove_via_api!
+        end
       end
 
       context 'when added to sub-group' do
@@ -161,6 +167,12 @@ module QA
           end.to raise_error(Resource::ApiFabricator::ResourceFabricationFailedError,
             /403 Forbidden - You are not allowed to push into this branch/)
         end
+
+        after do
+          sub_group_user.remove_via_api!
+          parent_group_project.remove_via_api!
+          sub_group.remove_via_api!
+        end
       end
     end
   end