Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/issue_templates/Doc_cleanup.md

@@ -7,6 +7,26 @@
 * feature development should use the Feature Request template.
 -->
 
+If you are a community contributor:
+
+1. To work on an issue, type `@gl-docsteam I would like to work on this issue.`
+   in a comment. A technical writer
+   will assign the issue to you. Do not work on the issue before it is assigned to you.
+   If someone has already chosen the issue, pick another or view docs [in the docs directory](https://gitlab.com/gitlab-org/gitlab/-/tree/master/doc)
+   and open a merge request for any page you feel can be improved.
+1. Create a merge request for the issue. If this is for a Hackathon, do not create the merge request
+   before the Hackathon has started or it will not be counted towards the Hackathon. If you were not
+   assigned the issue, do not create a merge request. It will not be accepted.
+1. Copy the link to this issue and add it to the merge request's description, which will link
+   the merge request and the issue together.
+1. After your merge request is accepted and merged, close this issue.
+
+If you notice things you'd like to fix that are not part of the issue, open separate merge requests for those issues.
+
+We're sorry for all the rules but we want everyone to have a good experience, and it can be hard when we get an influx of contributions.
+
+Thank you again for contributing to the GitLab documentation!
+
 ## Identified documentation issue
 
 <!--
@@ -19,19 +39,6 @@
 * the opportunities for contributors.
 -->
 
-## Process
-
-If you, as a contributor, decide to take this work on, assign this issue to yourself, and create one or more linked
-merge requests that resolve this issue. Be sure to close this issue after all linked merge requests are completed.
-
-The work for this issue should involve only what's listed in the previous section. If you identify other work that
-needs to be done, create separate, unlinked MRs as needed to address those items.
-
-When using automated test results for identified work, use this issue to work only on the listed lines. For
-example, if the tests list several lines that show the word "admin" as needing to possibly be "administrator,"
-do not modify other parts of the page that may also include "admin," as the testing may have excluded those lines
-(for example, they may be part of the **Admin Area** of GitLab).
-
 ## Additional information
 
 <!--

.gitlab/issue_templates/.gitlab/issue_templates/Vulnerability Disclosure.md .gitlab/issue_templates/Vulnerability Disclosure.md

@@ -146,25 +146,6 @@ Performance/CollectionLiteralInLoop:
 Performance/ConstantRegexp:
   Enabled: false
 
-# Offense count: 14
-# Cop supports --auto-correct.
-# Configuration parameters: SafeMultiline.
-Performance/DeletePrefix:
-  Exclude:
-    - 'app/helpers/submodule_helper.rb'
-    - 'app/workers/concerns/application_worker.rb'
-    - 'ee/lib/gitlab/geo/git_ssh_proxy.rb'
-    - 'lib/banzai/filter/repository_link_filter.rb'
-    - 'lib/gitlab/auth/ldap/dn.rb'
-    - 'lib/gitlab/gfm/uploads_rewriter.rb'
-    - 'lib/gitlab/git/ref.rb'
-    - 'lib/gitlab/project_template.rb'
-    - 'lib/gitlab/setup_helper.rb'
-    - 'lib/gitlab/time_tracking_formatter.rb'
-    - 'spec/controllers/projects/artifacts_controller_spec.rb'
-    - 'spec/lib/gitlab/gfm/uploads_rewriter_spec.rb'
-    - 'spec/support/helpers/test_env.rb'
-
 # Offense count: 121
 Performance/MethodObjectAsBlock:
   Enabled: false
@@ -398,22 +379,6 @@ Rails/WhereExists:
 Style/AccessorGrouping:
   Enabled: false
 
-# Offense count: 11
-# Cop supports --auto-correct.
-Style/ArrayCoercion:
-  Exclude:
-    - 'app/controllers/admin/ci/variables_controller.rb'
-    - 'app/controllers/groups/variables_controller.rb'
-    - 'app/controllers/projects/variables_controller.rb'
-    - 'db/migrate/20190620105427_change_null_private_profile_to_false.rb'
-    - 'db/post_migrate/20190812070645_migrate_private_profile_nulls.rb'
-    - 'db/post_migrate/20200311130802_schedule_populate_user_highest_roles_table.rb'
-    - 'db/post_migrate/20200805152108_migrate_null_external_diff_store_to_local_value.rb'
-    - 'db/post_migrate/20200806173633_migrate_null_package_files_file_store_to_local_value.rb'
-    - 'ee/app/services/geo/repository_verification_secondary_service.rb'
-    - 'ee/lib/ee/banzai/pipeline/gfm_pipeline.rb'
-    - 'spec/support/helpers/lfs_http_helpers.rb'
-
 # Offense count: 188
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -433,20 +398,6 @@ Style/BisectedAttrAccessor:
 Style/CaseLikeIf:
   Enabled: false
 
-# Offense count: 13
-Style/CombinableLoops:
-  Exclude:
-    - 'ee/db/fixtures/development/30_customizable_cycle_analytics.rb'
-    - 'ee/lib/gitlab/audit/events/preloader.rb'
-    - 'ee/spec/finders/snippets_finder_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/remove_duplicate_cs_findings_spec.rb'
-    - 'spec/features/merge_request/user_suggests_changes_on_diff_spec.rb'
-    - 'spec/finders/packages/group_packages_finder_spec.rb'
-    - 'spec/migrations/cleanup_optimistic_locking_nulls_pt2_fixed_spec.rb'
-    - 'spec/migrations/cleanup_optimistic_locking_nulls_spec.rb'
-    - 'spec/requests/api/members_spec.rb'
-    - 'spec/support/shared_examples/features/protected_branches_access_control_ce_shared_examples.rb'
-
 # Offense count: 5
 # Cop supports --auto-correct.
 Style/EachWithObject:
@@ -471,13 +422,6 @@ Style/EmptyElse:
 Style/EmptyMethod:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/ExpandPathArguments:
-  Exclude:
-    - 'cable/config.ru'
-    - 'config.ru'
-
 # Offense count: 118
 # Cop supports --auto-correct.
 Style/ExplicitBlockArgument:

.rubocop_todo.yml

@@ -878,7 +878,6 @@ RSpec/VerifiedDoubles:
     - spec/models/design_management/design_at_version_spec.rb
     - spec/models/diff_viewer/image_spec.rb
     - spec/models/environment_spec.rb
-    - spec/models/error_tracking/project_error_tracking_setting_spec.rb
     - spec/models/event_spec.rb
     - spec/models/external_issue_spec.rb
     - spec/models/hooks/web_hook_spec.rb

.rubocop_todo/rspec/verified_doubles.yml

@@ -0,0 +1,10 @@
+---
+# Cop supports --auto-correct.
+Style/ArrayCoercion:
+  Exclude:
+    - 'app/controllers/admin/ci/variables_controller.rb'
+    - 'app/controllers/groups/variables_controller.rb'
+    - 'app/controllers/projects/variables_controller.rb'
+    - 'ee/app/services/geo/repository_verification_secondary_service.rb'
+    - 'ee/lib/ee/banzai/pipeline/gfm_pipeline.rb'
+    - 'spec/support/helpers/lfs_http_helpers.rb'

.rubocop_todo/style/array_coercion.yml

@@ -0,0 +1,10 @@
+---
+Style/CombinableLoops:
+  Exclude:
+    - 'ee/db/fixtures/development/30_customizable_cycle_analytics.rb'
+    - 'ee/lib/gitlab/audit/events/preloader.rb'
+    - 'ee/spec/finders/snippets_finder_spec.rb'
+    - 'spec/features/merge_request/user_suggests_changes_on_diff_spec.rb'
+    - 'spec/finders/packages/group_packages_finder_spec.rb'
+    - 'spec/requests/api/members_spec.rb'
+    - 'spec/support/shared_examples/features/protected_branches_access_control_ce_shared_examples.rb'

.rubocop_todo/style/combinable_loops.yml

@@ -8,7 +8,6 @@ Style/OpenStructUse:
   - ee/spec/lib/gitlab/auth/group_saml/failure_handler_spec.rb
   - ee/spec/lib/gitlab/legacy_github_import/project_creator_spec.rb
   - lib/gitlab/testing/request_inspector_middleware.rb
-  - spec/factories/go_module_versions.rb
   - spec/factories/wiki_pages.rb
   - spec/graphql/mutations/branches/create_spec.rb
   - spec/graphql/mutations/clusters/agent_tokens/create_spec.rb

.rubocop_todo/style/open_struct_use.yml

@@ -37,7 +37,7 @@ export default {
     anchor: 'update-the-agent-version',
   }),
   configHelpLink: helpPagePath('user/clusters/agent/install/index', {
-    anchor: 'create-an-agent-without-configuration-file',
+    anchor: 'create-an-agent-configuration-file',
   }),
   inject: ['gitlabVersion'],
   props: {

app/assets/javascripts/clusters_list/components/agent_table.vue

@@ -31,7 +31,7 @@ export default {
   EVENT_LABEL_MODAL,
   enableKasPath: helpPagePath('administration/clusters/kas'),
   registerAgentPath: helpPagePath('user/clusters/agent/install/index', {
-    anchor: 'register-an-agent-with-gitlab',
+    anchor: 'register-the-agent-with-gitlab',
   }),
   components: {
     AvailableAgentsDropdown,

app/assets/javascripts/clusters_list/components/install_agent_modal.vue

@@ -2,6 +2,7 @@
 import {
   GlCollapse,
   GlDropdown,
+  GlBadge,
   GlButton,
   GlLink,
   GlSprintf,
@@ -26,6 +27,7 @@ export default {
   components: {
     GlCollapse,
     GlDropdown,
+    GlBadge,
     GlButton,
     GlLink,
     GlSprintf,
@@ -74,6 +76,7 @@ export default {
       'Environments|There are no deployments for this environment yet. %{linkStart}Learn more about setting up deployments.%{linkEnd}',
     ),
     autoStopIn: s__('Environment|Auto stop %{time}'),
+    tierTooltip: s__('Environment|Deployment tier'),
   },
   data() {
     return { visible: false };
@@ -100,6 +103,9 @@ export default {
     hasDeployment() {
       return Boolean(this.environment?.upcomingDeployment || this.environment?.lastDeployment);
     },
+    tier() {
+      return this.lastDeployment?.tierInYaml;
+    },
     hasOpenedAlert() {
       return this.environment?.hasOpenedAlert;
     },
@@ -206,6 +212,13 @@ export default {
         >
           {{ displayName }}
         </gl-link>
+        <gl-badge
+          v-if="tier"
+          v-gl-tooltip
+          :title="$options.i18n.tierTooltip"
+          class="gl-ml-3 gl-font-monospace"
+          >{{ tier }}</gl-badge
+        >
       </div>
       <div class="gl-display-flex gl-align-items-center">
         <p v-if="canShowAutoStopDate" class="gl-font-sm gl-text-gray-700 gl-mr-5 gl-mb-0">

app/assets/javascripts/environments/components/new_environment_item.vue

@@ -24,7 +24,7 @@ const mapNestedEnvironment = (env) => ({
   __typename: 'NestedLocalEnvironment',
 });
 const mapEnvironment = (env) => ({
-  ...convertObjectPropsToCamelCase(env),
+  ...convertObjectPropsToCamelCase(env, { deep: true }),
   __typename: 'LocalEnvironment',
 });
 

app/assets/javascripts/environments/graphql/resolvers.js

@@ -1,5 +1,6 @@
 <script>
 import { GlLink, GlIcon, GlTooltipDirective } from '@gitlab/ui';
+import { IssuableStatus } from '~/issues/constants';
 import {
   dateInWords,
   getTimeRemainingInWords,
@@ -41,7 +42,10 @@ export default {
       return this.issue.dueDate && dateInWords(newDateAsLocaleTime(this.issue.dueDate), true);
     },
     showDueDateInRed() {
-      return isInPast(newDateAsLocaleTime(this.issue.dueDate)) && !this.issue.closedAt;
+      return (
+        isInPast(newDateAsLocaleTime(this.issue.dueDate)) &&
+        this.issue.state !== IssuableStatus.Closed
+      );
     },
     timeEstimate() {
       return this.issue.humanTimeEstimate || this.issue.timeStats?.humanTimeEstimate;

app/assets/javascripts/issues/list/components/issue_card_time_info.vue

@@ -19,6 +19,7 @@ import { convertToGraphQLId, getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { ITEM_TYPE } from '~/groups/constants';
 import CsvImportExportButtons from '~/issuable/components/csv_import_export_buttons.vue';
 import IssuableByEmail from '~/issuable/components/issuable_by_email.vue';
+import { IssuableStatus } from '~/issues/constants';
 import axios from '~/lib/utils/axios_utils';
 import { scrollUp } from '~/lib/utils/scroll_utils';
 import { getParameterByName, joinPaths } from '~/lib/utils/url_utility';
@@ -480,10 +481,10 @@ export default {
       return `${this.exportCsvPath}${window.location.search}`;
     },
     getStatus(issue) {
-      if (issue.closedAt && issue.moved) {
+      if (issue.state === IssuableStatus.Closed && issue.moved) {
         return this.$options.i18n.closedMoved;
       }
-      if (issue.closedAt) {
+      if (issue.state === IssuableStatus.Closed) {
         return this.$options.i18n.closed;
       }
       return undefined;

app/assets/javascripts/issues/list/components/issues_list_app.vue

@@ -2,7 +2,6 @@ fragment IssueFragment on Issue {
   __typename
   id
   iid
-  closedAt
   confidential
   createdAt
   downvotes
@@ -11,6 +10,7 @@ fragment IssueFragment on Issue {
   humanTimeEstimate
   mergeRequestsCount
   moved
+  state
   title
   updatedAt
   upvotes

app/assets/javascripts/issues/list/queries/issue.fragment.graphql

@@ -124,7 +124,7 @@ MergeRequest.prototype.submitNoteForm = function (form, $button) {
 
 MergeRequest.decreaseCounter = function (by = 1) {
   const $el = $('.js-merge-counter');
-  const count = Math.max(parseInt($el.text().replace(/[^\d]/, ''), 10) - by, 0);
+  const count = Math.max(parseInt($el.first().text().replace(/[^\d]/, ''), 10) - by, 0);
 
   $el.text(addDelimiter(count));
 };

app/assets/javascripts/merge_request.js

@@ -29,6 +29,8 @@ def issuable_type
     validate :check_self_relation
     validate :check_opposite_relation
 
+    scope :for_source_or_target, ->(issuable) { where(source: issuable).or(where(target: issuable)) }
+
     enum link_type: { TYPE_RELATES_TO => 0, TYPE_BLOCKS => 1 }
 
     private

app/models/concerns/issuable_link.rb

@@ -380,6 +380,12 @@ def equal_to?(params)
       status == params[:status]
   end
 
+  def tier_in_yaml
+    return unless deployable
+
+    deployable.environment_deployment_tier
+  end
+
   private
 
   def update_status!(status)

app/models/deployment.rb

@@ -135,7 +135,7 @@ def issue_latest_event(opts = {})
       end
     end
 
-    def update_issue(opts = {} )
+    def update_issue(opts = {})
       handle_exceptions do
         { updated: sentry_client.update_issue(opts) }
       end

app/models/error_tracking/project_error_tracking_setting.rb

@@ -23,6 +23,7 @@ class DeploymentEntity < Grape::Entity
   expose :tag
   expose :last?
   expose :last?, as: :is_last
+  expose :tier_in_yaml
 
   expose :deployed_by, as: :user, using: UserEntity
 

app/serializers/deployment_entity.rb

@@ -41,6 +41,8 @@ def handle_aborted_migration
         Gitlab::ErrorTracking.log_exception(e, next_aborted_repository_id: next_aborted_repository&.id)
 
         true
+      ensure
+        log_repository_migration_state(next_aborted_repository)
       end
 
       def handle_next_migration
@@ -59,6 +61,8 @@ def handle_next_migration
         next_repository&.abort_import
 
         false
+      ensure
+        log_repository_migration_state(next_repository)
       end
 
       def tag_count_too_high?
@@ -151,6 +155,12 @@ def log_repository(repository)
         log_extra_metadata_on_done(:container_repository_path, repository&.path)
       end
 
+      def log_repository_migration_state(repository)
+        return unless repository
+
+        log_extra_metadata_on_done(:container_repository_migration_state, repository.migration_state)
+      end
+
       # used by ExclusiveLeaseGuard
       def lease_key
         'container_registry:migration:enqueuer_worker'

app/workers/container_registry/migration/enqueuer_worker.rb

@@ -2,7 +2,7 @@
 
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment', __FILE__)
+require ::File.expand_path('config/environment', __dir__)
 
 warmup do |app|
   client = Rack::MockRequest.new(app)

config.ru

@@ -2484,8 +2484,10 @@ Use `changes` in pipelines with the following refs:
 - Paths to files.
 - Wildcard paths for single directories, for example `path/to/directory/*`, or a directory
   and all its subdirectories, for example `path/to/directory/**/*`.
-- Wildcard ([glob](https://en.wikipedia.org/wiki/Glob_(programming))) paths for all
+- Wildcard [glob](https://en.wikipedia.org/wiki/Glob_(programming)) paths for all
   files with the same extension or multiple extensions, for example `*.md` or `path/to/directory/*.{rb,py,sh}`.
+  See the [Ruby `fnmatch` documentation](https://docs.ruby-lang.org/en/master/File.html#method-c-fnmatch)
+  for the supported syntax list.
 - Wildcard paths to files in the root directory, or all directories, wrapped in double quotes.
   For example `"*.json"` or `"**/*.json"`.