Add latest changes from gitlab-org/gitlab@master

15 files changed, 44 insertions, 22 deletions

diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index 85f601f19c7..c0c2499a257 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -380,6 +380,7 @@ Dangerfile
 /lib/gitlab/url_blocker.rb
 /lib/gitlab/url_blockers/
 /lib/gitlab/utils.rb
+/lib/gitlab/path_traversal.rb
 
 ^[Gitaly] @proglottis @toon
 lib/gitlab/git_access.rb
@@ -423,6 +424,7 @@ lib/gitlab/checks/**
 /doc/administration/incoming_email.md @msedlakjakubowski
 /doc/administration/index.md @axil
 /doc/administration/instance_limits.md @axil
+/doc/administration/integration/diagrams_net.md @aqualls @msedlakjakubowski
 /doc/administration/integration/kroki.md @msedlakjakubowski
 /doc/administration/integration/mailgun.md @msedlakjakubowski
 /doc/administration/integration/plantuml.md @aqualls @msedlakjakubowski
@@ -706,6 +708,7 @@ lib/gitlab/checks/**
 /doc/development/graphql_guide/ @eread @ashrafkhamis
 /doc/development/graphql_guide/batchloader.md @aqualls
 /doc/development/i18n/ @eread @ashrafkhamis
+/doc/development/identity_verification.md @phillipwells
 /doc/development/image_scaling.md @lciutacu
 /doc/development/import_export.md @eread @ashrafkhamis
 /doc/development/index.md @sselhorn
@@ -784,6 +787,7 @@ lib/gitlab/checks/**
 /doc/raketasks/x509_signatures.md @aqualls @msedlakjakubowski
 /doc/security/ @jglassman1
 /doc/security/email_verification.md @phillipwells
+/doc/security/identity_verification.md @phillipwells
 /doc/subscriptions/ @fneill
 /doc/topics/authentication/ @jglassman1
 /doc/topics/autodevops/ @phillipwells
@@ -932,7 +936,6 @@ lib/gitlab/checks/**
 /doc/user/project/repository/ @aqualls @msedlakjakubowski
 /doc/user/project/repository/file_finder.md @ashrafkhamis
 /doc/user/project/repository/managing_large_repositories.md @axil
-/doc/user/project/repository/reducing_the_repo_size_using_git.md @eread
 /doc/user/project/repository/vscode.md @ashrafkhamis
 /doc/user/project/repository/web_editor.md @ashrafkhamis
 /doc/user/project/requirements/ @msedlakjakubowski
diff --git a/Gemfile b/Gemfile
index 3b8e8506416..db1a0d640e5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -172,9 +172,9 @@ gem 'seed-fu', '~> 2.3.7'
 gem 'elasticsearch-model', '~> 7.2'
 gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
 gem 'elasticsearch-api',   '7.13.3'
-gem 'aws-sdk-core', '~> 3.173.1'
+gem 'aws-sdk-core', '~> 3.174.0'
 gem 'aws-sdk-cloudformation', '~> 1'
-gem 'aws-sdk-s3', '~> 1.122.0'
+gem 'aws-sdk-s3', '~> 1.123.0'
 gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
 gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
 
diff --git a/Gemfile.checksum b/Gemfile.checksum
index ba1e800812b..343678274f1 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -37,9 +37,9 @@
 {"name":"aws-eventstream","version":"1.2.0","platform":"ruby","checksum":"ffa53482c92880b001ff2fb06919b9bb82fd847cbb0fa244985d2ebb6dd0d1df"},
 {"name":"aws-partitions","version":"1.761.0","platform":"ruby","checksum":"291e444e1edfc92c5521a6dbdd1236ccc3f122b3520163b2be6ec5b6ef350ef2"},
 {"name":"aws-sdk-cloudformation","version":"1.41.0","platform":"ruby","checksum":"31e47539719734413671edf9b1a31f8673fbf9688549f50c41affabbcb1c6b26"},
-{"name":"aws-sdk-core","version":"3.173.1","platform":"ruby","checksum":"692acfcf95bce8cbbde97a9db077d219cf72ccd1b76afa354bcaf21eebb1d9f6"},
+{"name":"aws-sdk-core","version":"3.174.0","platform":"ruby","checksum":"b694c6b0ffd6e683d952a92fd005ef5446c8de79056e8cc727e26204eee149e4"},
 {"name":"aws-sdk-kms","version":"1.64.0","platform":"ruby","checksum":"40de596c95047bfc6e1aacea24f3df6241aa716b6f7ce08ac4c5f7e3120395ad"},
-{"name":"aws-sdk-s3","version":"1.122.0","platform":"ruby","checksum":"3d1fb6d0a6c55cf568ff66d657b4a6e7eaa718675f1f3156d7b44e3791f39905"},
+{"name":"aws-sdk-s3","version":"1.123.0","platform":"ruby","checksum":"ee281b41753952fc1d0d4a6b35a6615e495870ced2e9e207b2aa470505e7e869"},
 {"name":"aws-sigv4","version":"1.5.1","platform":"ruby","checksum":"d68c87fff4ee843b4b92b23c7f31f957f254ec6eb064181f7119124aab8b8bb4"},
 {"name":"axe-core-api","version":"4.6.0","platform":"ruby","checksum":"1b0ddec3353f108dc10363baf2282f43a5ff7f13d4e25f99071294e78f8a6c62"},
 {"name":"axe-core-rspec","version":"4.6.0","platform":"ruby","checksum":"11c25bc9dd388c137ba4e5e63d64d20092bf22c884d8ffc829a22acfbacd747f"},
diff --git a/Gemfile.lock b/Gemfile.lock
index 3c0284593f0..a6d9a889e2d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -203,7 +203,7 @@ GEM
     aws-sdk-cloudformation (1.41.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.173.1)
+    aws-sdk-core (3.174.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -211,8 +211,8 @@ GEM
     aws-sdk-kms (1.64.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.122.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-s3 (1.123.0)
+      aws-sdk-core (~> 3, >= 3.174.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.5.1)
@@ -1669,8 +1669,8 @@ DEPENDENCIES
   autoprefixer-rails (= 10.2.5.1)
   awesome_print
   aws-sdk-cloudformation (~> 1)
-  aws-sdk-core (~> 3.173.1)
-  aws-sdk-s3 (~> 1.122.0)
+  aws-sdk-core (~> 3.174.0)
+  aws-sdk-s3 (~> 1.123.0)
   axe-core-rspec
   babosa (~> 2.0)
   base32 (~> 0.3.0)
diff --git a/app/graphql/types/ci/catalog/resource_type.rb b/app/graphql/types/ci/catalog/resource_type.rb
index b90ae111a3d..ac45f299a1a 100644
--- a/app/graphql/types/ci/catalog/resource_type.rb
+++ b/app/graphql/types/ci/catalog/resource_type.rb
@@ -41,6 +41,8 @@ module Types
           description: 'Root namespace of the catalog resource.',
           alpha: { milestone: '16.1' }
 
+        markdown_field :readme_html, null: false
+
         def web_path
           ::Gitlab::Routing.url_helpers.project_path(object.project)
         end
@@ -71,6 +73,10 @@ module Types
             projects.each { |project| loader.call(project.id, project.root_ancestor) }
           end
         end
+
+        def readme_html_resolver
+          ::MarkupHelper.markdown(object.project.repository.readme&.data, context.to_h.dup)
+        end
       end
       # rubocop: enable Graphql/AuthorizeTypes
     end
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 4232e654d13..ee5f1a3edd4 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -702,6 +702,10 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord
   validates :namespace_aggregation_schedule_lease_duration_in_seconds,
     numericality: { only_integer: true, greater_than: 0 }
 
+  validates :instance_level_code_suggestions_enabled,
+    allow_nil: false,
+    inclusion: { in: [true, false], message: N_('must be a boolean value') }
+
   attr_encrypted :asset_proxy_secret_key,
     mode: :per_attribute_iv,
     key: Settings.attr_encrypted_db_key_base_truncated,
diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml
index 1df323e7451..53c3d16ee64 100644
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
@@ -18,17 +18,17 @@
 = form_tag namespace_project_tags_path, method: :post, id: "new-tag-form", class: "common-note-form tag-form js-quick-submit js-requires-input" do
   .form-group.row
     .col-sm-12
-      = label_tag :tag_name, nil
+      = label_tag :tag_name, _('Tag name')
       = text_field_tag :tag_name, params[:tag_name], required: true, autofocus: true, class: 'form-control', data: { qa_selector: "tag_name_field" }
   .form-group.row
     .col-sm-auto.create-from
-      = label_tag :ref, 'Create from'
+      = label_tag :ref, _('Create from')
       .js-new-tag-ref-selector{ data: { project_id: @project.id, default_branch_name: default_ref, hidden_input_name: 'ref' } }
       .form-text.text-muted
         = s_('TagsPage|Existing branch name, tag, or commit SHA')
   .form-group.row
     .col-sm-12
-      = label_tag :message, nil
+      = label_tag :message, _('Message')
       = text_area_tag :message, @message, required: false, class: 'form-control', rows: 5, data: { qa_selector: "tag_message_field" }
       .form-text.text-muted
         = tag_description_help_text
diff --git a/db/migrate/20230530162437_add_instance_code_suggestion_enabled_to_app_settings.rb b/db/migrate/20230530162437_add_instance_code_suggestion_enabled_to_app_settings.rb
new file mode 100644
index 00000000000..15964ecd592
--- /dev/null
+++ b/db/migrate/20230530162437_add_instance_code_suggestion_enabled_to_app_settings.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddInstanceCodeSuggestionEnabledToAppSettings < Gitlab::Database::Migration[2.1]
+  def change
+    add_column :application_settings, :instance_level_code_suggestions_enabled, :boolean, null: false, default: false
+  end
+end
diff --git a/db/schema_migrations/20230530162437 b/db/schema_migrations/20230530162437
new file mode 100644
index 00000000000..0669629e95a
--- /dev/null
+++ b/db/schema_migrations/20230530162437
@@ -0,0 +1 @@
+b07828fad996d20f523d7d5b19da2c10e0faa3fe0784a8e314b6db077cbd99c8
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index eb7d753fecb..faec2494dd1 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -11847,6 +11847,7 @@ CREATE TABLE application_settings (
     encrypted_vertex_ai_credentials bytea,
     encrypted_vertex_ai_credentials_iv bytea,
     vertex_ai_project text,
+    instance_level_code_suggestions_enabled boolean DEFAULT false NOT NULL,
     CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)),
     CONSTRAINT app_settings_container_registry_pre_import_tags_rate_positive CHECK ((container_registry_pre_import_tags_rate >= (0)::numeric)),
     CONSTRAINT app_settings_dep_proxy_ttl_policies_worker_capacity_positive CHECK ((dependency_proxy_ttl_group_policy_worker_capacity >= 0)),
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 83076cab73a..afaf44b876b 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -12456,6 +12456,7 @@ Represents the total number of issues and their weights for a particular day.
 | <a id="cicatalogresourceicon"></a>`icon` **{warning-solid}** | [`String`](#string) | **Introduced** in 15.11. This feature is an Experiment. It can be changed or removed at any time. Icon for the catalog resource. |
 | <a id="cicatalogresourceid"></a>`id` **{warning-solid}** | [`ID!`](#id) | **Introduced** in 15.11. This feature is an Experiment. It can be changed or removed at any time. ID of the catalog resource. |
 | <a id="cicatalogresourcename"></a>`name` **{warning-solid}** | [`String`](#string) | **Introduced** in 15.11. This feature is an Experiment. It can be changed or removed at any time. Name of the catalog resource. |
+| <a id="cicatalogresourcereadmehtml"></a>`readmeHtml` | [`String!`](#string) | GitLab Flavored Markdown rendering of `readme`. |
 | <a id="cicatalogresourcerootnamespace"></a>`rootNamespace` **{warning-solid}** | [`Namespace`](#namespace) | **Introduced** in 16.1. This feature is an Experiment. It can be changed or removed at any time. Root namespace of the catalog resource. |
 | <a id="cicatalogresourcestarcount"></a>`starCount` **{warning-solid}** | [`Int!`](#int) | **Introduced** in 16.1. This feature is an Experiment. It can be changed or removed at any time. Number of times the catalog resource has been starred. |
 | <a id="cicatalogresourcewebpath"></a>`webPath` **{warning-solid}** | [`String`](#string) | **Introduced** in 16.1. This feature is an Experiment. It can be changed or removed at any time. Web path of the catalog resource. |
diff --git a/doc/development/contributing/index.md b/doc/development/contributing/index.md
index 82a08246503..98139af23d6 100644
--- a/doc/development/contributing/index.md
+++ b/doc/development/contributing/index.md
@@ -36,13 +36,8 @@ open a [new issue](https://gitlab.com/gitlab-org/gitlab/-/issues/new?issue%5Bmil
 Select the appropriate template, and add all the necessary information about the work you are planning on doing.
 That way you can get more guidance and support from GitLab team members.
 
-If you're not sure what to work on, you can:
-
-- View issues with the
-  [`~Seeking community contributions` label](../labels/index.md#label-for-community-contributors).
-- Optimize tests. Use [RSpec profiling statistics](https://gitlab-org.gitlab.io/rspec_profiling_stats/)
-  to identify the slowest tests. These tests are good candidates for improving and checking if any
-  [best practices](../testing_guide/best_practices.md) can speed them up.
+If you're not sure what to work on, you can [view issues](https://gitlab.com/groups/gitlab-org/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=quick%20win&label_name%5B%5D=Seeking%20community%20contributions&first_page_size=100) with the
+  `~Seeking community contributions` and `~quick win` label.
 
 When you find an issue, leave a comment on the issue you want to work on.
 This helps the GitLab team and members of the wider GitLab community know that you will be working on that issue.
diff --git a/doc/user/project/repository/reducing_the_repo_size_using_git.md b/doc/user/project/repository/reducing_the_repo_size_using_git.md
index 97c56b9158d..d519fda764f 100644
--- a/doc/user/project/repository/reducing_the_repo_size_using_git.md
+++ b/doc/user/project/repository/reducing_the_repo_size_using_git.md
@@ -1,6 +1,6 @@
 ---
-stage: Systems
-group: Gitaly
+stage: Create
+group: Source Code
 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
 ---
 
diff --git a/spec/graphql/types/ci/catalog/resource_type_spec.rb b/spec/graphql/types/ci/catalog/resource_type_spec.rb
index d1f8adcd4fb..dee790a0c93 100644
--- a/spec/graphql/types/ci/catalog/resource_type_spec.rb
+++ b/spec/graphql/types/ci/catalog/resource_type_spec.rb
@@ -16,6 +16,7 @@ RSpec.describe Types::Ci::Catalog::ResourceType, feature_category: :pipeline_com
       star_count
       forks_count
       root_namespace
+      readme_html
     ]
 
     expect(described_class).to have_graphql_fields(*expected_fields)
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index e6f99842621..cee49f54ddc 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -280,6 +280,9 @@ RSpec.describe ApplicationSetting, feature_category: :shared, type: :model do
 
     it { is_expected.to validate_numericality_of(:namespace_aggregation_schedule_lease_duration_in_seconds).only_integer.is_greater_than(0) }
 
+    it { is_expected.to allow_values([true, false]).for(:instance_level_code_suggestions_enabled) }
+    it { is_expected.not_to allow_value(nil).for(:instance_level_code_suggestions_enabled) }
+
     context 'when deactivate_dormant_users is enabled' do
       before do
         stub_application_setting(deactivate_dormant_users: true)