Add latest changes from gitlab-org/gitlab@master

19 files changed, 101 insertions, 53 deletions

diff --git a/app/finders/ci/pipelines_finder.rb b/app/finders/ci/pipelines_finder.rb
index 6ba2ae91d6c..9be9d641893 100644
--- a/app/finders/ci/pipelines_finder.rb
+++ b/app/finders/ci/pipelines_finder.rb
@@ -149,9 +149,7 @@ module Ci
     # rubocop: enable CodeReuse/ActiveRecord
 
     def by_name(items)
-      return items unless
-        Feature.enabled?(:pipeline_name_search, project) &&
-          params[:name].present?
+      return items unless params[:name].present?
 
       items.for_name(params[:name])
     end
diff --git a/app/models/integrations/jira.rb b/app/models/integrations/jira.rb
index e8f283054a4..268c36b3517 100644
--- a/app/models/integrations/jira.rb
+++ b/app/models/integrations/jira.rb
@@ -243,8 +243,8 @@ module Integrations
         }
       ]
 
-      # Jira issues is currently only configurable on the project level.
-      if project_level?
+      # Currently, Jira issues are only configurable at the project and group levels.
+      unless instance_level?
         sections.push({
           type: SECTION_TYPE_JIRA_ISSUES,
           title: _('Issues'),
diff --git a/config/feature_flags/development/pipeline_name_search.yml b/config/feature_flags/development/pipeline_name_search.yml
deleted file mode 100644
index ccf4f4a6c9c..00000000000
--- a/config/feature_flags/development/pipeline_name_search.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: pipeline_name_search
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107086
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385864
-milestone: '15.7'
-type: development
-group: group::delivery
-default_enabled: false
diff --git a/db/docs/boards_epic_board_recent_visits.yml b/db/docs/boards_epic_board_recent_visits.yml
index 2262241a0c0..df4c19a591d 100644
--- a/db/docs/boards_epic_board_recent_visits.yml
+++ b/db/docs/boards_epic_board_recent_visits.yml
@@ -4,7 +4,16 @@ classes:
 - Boards::EpicBoardRecentVisit
 feature_categories:
 - portfolio_management
-description: The epic board most recently visited by users, used to determine where to redirect them by default
+description: The epic board most recently visited by users, used to determine where
+  to redirect them by default
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60720
 milestone: '13.12'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+sharding_key:
+  group_id: namespaces
diff --git a/db/docs/boards_epic_boards.yml b/db/docs/boards_epic_boards.yml
index d55e99e58f0..5bf2e02fa89 100644
--- a/db/docs/boards_epic_boards.yml
+++ b/db/docs/boards_epic_boards.yml
@@ -4,7 +4,16 @@ classes:
 - Boards::EpicBoard
 feature_categories:
 - portfolio_management
-description: Configuration information for epic boards, including default scope and visibility of open and closed lists
+description: Configuration information for epic boards, including default scope and
+  visibility of open and closed lists
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48658
 milestone: '13.7'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+sharding_key:
+  group_id: namespaces
diff --git a/db/docs/epics.yml b/db/docs/epics.yml
index 2cc82b178d6..8a564d6e039 100644
--- a/db/docs/epics.yml
+++ b/db/docs/epics.yml
@@ -4,7 +4,16 @@ classes:
 - Epic
 feature_categories:
 - portfolio_management
-description: Information directly related to Epics, used by epic management features and the roadmap
+description: Information directly related to Epics, used by epic management features
+  and the roadmap
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3126
 milestone: '10.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+sharding_key:
+  group_id: namespaces
diff --git a/db/docs/ml_experiments.yml b/db/docs/ml_experiments.yml
index efae3c53119..f37fe7db8a3 100644
--- a/db/docs/ml_experiments.yml
+++ b/db/docs/ml_experiments.yml
@@ -1,10 +1,18 @@
 ---
 table_name: ml_experiments
 classes:
-  - Ml::Experiment
+- Ml::Experiment
 feature_categories:
-  - mlops
+- mlops
 description: A Machine Learning Experiments groups many Model Candidates
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95168
 milestone: '15.4'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+sharding_key:
+  project_id: projects
diff --git a/db/docs/ml_model_versions.yml b/db/docs/ml_model_versions.yml
index 9e86c9d0bdc..82203018084 100644
--- a/db/docs/ml_model_versions.yml
+++ b/db/docs/ml_model_versions.yml
@@ -1,10 +1,18 @@
 ---
 table_name: ml_model_versions
 classes:
-  - Ml::ModelVersion
+- Ml::ModelVersion
 feature_categories:
-  - mlops
+- mlops
 description: A version of a machine learning model for the model registry
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125729
 milestone: '16.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+sharding_key:
+  project_id: projects
diff --git a/db/docs/ml_models.yml b/db/docs/ml_models.yml
index 112a1f9263c..f8d412f6652 100644
--- a/db/docs/ml_models.yml
+++ b/db/docs/ml_models.yml
@@ -1,10 +1,18 @@
 ---
 table_name: ml_models
 classes:
-  - Ml::Model
+- Ml::Model
 feature_categories:
-  - mlops
+- mlops
 description: A machine learning model for the model registry
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125302
 milestone: '16.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+sharding_key:
+  project_id: projects
diff --git a/doc/administration/logs/index.md b/doc/administration/logs/index.md
index 08f31439b26..f5b83f27183 100644
--- a/doc/administration/logs/index.md
+++ b/doc/administration/logs/index.md
@@ -1098,6 +1098,10 @@ For example:
 }
 ```
 
+## Let's Encrypt logs
+
+For Linux package installations, Let's Encrypt [auto-renew](https://docs.gitlab.com/omnibus/settings/ssl/#renew-the-certificates-automatically) logs are in `/var/log/gitlab/lets-encrypt/`.
+
 ## Mattermost logs
 
 For Linux package installations, Mattermost logs are in these locations:
diff --git a/doc/api/pipelines.md b/doc/api/pipelines.md
index 1b75a3f74b5..d07a63cde1e 100644
--- a/doc/api/pipelines.md
+++ b/doc/api/pipelines.md
@@ -19,12 +19,7 @@ Read more on [pagination](rest/index.md#pagination).
 > - `name` in response [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115310) in GitLab 15.11 [with a flag](../administration/feature_flags.md) named `pipeline_name_in_api`. Disabled by default.
 > - `name` in request [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115310) in 15.11 [with a flag](../administration/feature_flags.md) named `pipeline_name_search`. Disabled by default.
 > - `name` in response [generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/398131) in GitLab 16.3. Feature flag `pipeline_name_in_api` removed.
-
-FLAG:
-On self-managed GitLab, by default the `name` field in a request is ignored.
-To make it available, an administrator can [enable the feature flag](../administration/feature_flags.md)
-named `pipeline_name_search`.
-On GitLab.com, this feature is available.
+> - `name` in request [generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/385864) in GitLab 16.9. Feature flag `pipeline_name_search` removed.
 
 List pipelines in a project. Child pipelines are not included in the results,
 but you can [get child pipeline](pipelines.md#get-a-single-pipeline) individually.
diff --git a/doc/ci/variables/predefined_variables.md b/doc/ci/variables/predefined_variables.md
index 470982c7d26..645cd9ee9af 100644
--- a/doc/ci/variables/predefined_variables.md
+++ b/doc/ci/variables/predefined_variables.md
@@ -45,7 +45,7 @@ as it can cause the pipeline to behave unexpectedly.
 | `CI_COMMIT_SHORT_SHA`             | Pipeline    | 11.7   | all    | The first eight characters of `CI_COMMIT_SHA`. |
 | `CI_COMMIT_TAG`                   | Pipeline    | 9.0    | 0.5    | The commit tag name. Available only in pipelines for tags. |
 | `CI_COMMIT_TAG_MESSAGE`           | Pipeline    | 15.5   | all    | The commit tag message. Available only in pipelines for tags. |
-| `CI_COMMIT_TIMESTAMP`             | Pipeline    | 13.4   | all    | The timestamp of the commit in the [ISO 8601](https://www.rfc-editor.org/rfc/rfc3339#appendix-A) format. For example, `2022-01-31T16:47:55Z`. |
+| `CI_COMMIT_TIMESTAMP`             | Pipeline    | 13.4   | all    | The timestamp of the commit in the [ISO 8601](https://www.rfc-editor.org/rfc/rfc3339#appendix-A) format. For example, `2022-01-31T16:47:55Z`. [UTC by default](../../administration/timezone.md). |
 | `CI_COMMIT_TITLE`                 | Pipeline    | 10.8   | all    | The title of the commit. The full first line of the message. |
 | `CI_CONCURRENT_ID`                | Jobs only   | all    | 11.10  | The unique ID of build execution in a single executor. |
 | `CI_CONCURRENT_PROJECT_ID`        | Jobs only   | all    | 11.10  | The unique ID of build execution in a single executor and project. |
@@ -83,7 +83,7 @@ as it can cause the pipeline to behave unexpectedly.
 | `CI_JOB_TIMEOUT`                  | Jobs only   | 15.7   | 15.7   | The job timeout, in seconds. |
 | `CI_JOB_TOKEN`                    | Jobs only   | 9.0    | 1.2    | A token to authenticate with [certain API endpoints](../jobs/ci_job_token.md). The token is valid as long as the job is running. |
 | `CI_JOB_URL`                      | Jobs only   | 11.1   | 0.5    | The job details URL. |
-| `CI_JOB_STARTED_AT`               | Jobs only   | 13.10  | all    | The UTC datetime when a job started, in [ISO 8601](https://www.rfc-editor.org/rfc/rfc3339#appendix-A) format. For example, `2022-01-31T16:47:55Z`. |
+| `CI_JOB_STARTED_AT`               | Jobs only   | 13.10  | all    | The date and time when a job started, in [ISO 8601](https://www.rfc-editor.org/rfc/rfc3339#appendix-A) format. For example, `2022-01-31T16:47:55Z`. [UTC by default](../../administration/timezone.md). |
 | `CI_KUBERNETES_ACTIVE`            | Pipeline    | 13.0   | all    | Only available if the pipeline has a Kubernetes cluster available for deployments. `true` when available. |
 | `CI_NODE_INDEX`                   | Pipeline    | 11.5   | all    | The index of the job in the job set. Only available if the job uses [`parallel`](../yaml/index.md#parallel). |
 | `CI_NODE_TOTAL`                   | Pipeline    | 11.5   | all    | The total number of instances of this job running in parallel. Set to `1` if the job does not use [`parallel`](../yaml/index.md#parallel). |
@@ -95,7 +95,7 @@ as it can cause the pipeline to behave unexpectedly.
 | `CI_PIPELINE_SOURCE`              | Pipeline    | 10.0   | all    | How the pipeline was triggered. Can be `push`, `web`, `schedule`, `api`, `external`, `chat`, `webide`, `merge_request_event`, `external_pull_request_event`, `parent_pipeline`, [`trigger`, or `pipeline`](../triggers/index.md#configure-cicd-jobs-to-run-in-triggered-pipelines). For a description of each value, see [Common `if` clauses for `rules`](../jobs/job_control.md#common-if-clauses-for-rules), which uses this variable to control when jobs run. |
 | `CI_PIPELINE_TRIGGERED`           | Pipeline    | all    | all    | `true` if the job was [triggered](../triggers/index.md). |
 | `CI_PIPELINE_URL`                 | Jobs only   | 11.1   | 0.5    | The URL for the pipeline details. |
-| `CI_PIPELINE_CREATED_AT`          | Pipeline    | 13.10  | all    | The UTC datetime when the pipeline was created, in [ISO 8601](https://www.rfc-editor.org/rfc/rfc3339#appendix-A) format. For example, `2022-01-31T16:47:55Z`. |
+| `CI_PIPELINE_CREATED_AT`          | Pipeline    | 13.10  | all    | The date and time when the pipeline was created, in [ISO 8601](https://www.rfc-editor.org/rfc/rfc3339#appendix-A) format. For example, `2022-01-31T16:47:55Z`. [UTC by default](../../administration/timezone.md). |
 | `CI_PIPELINE_NAME`                | Pipeline    | 16.3   | all    | The pipeline name defined in [`workflow:name`](../yaml/index.md#workflowname) |
 | `CI_PROJECT_DIR`                  | Jobs only   | all    | all    | The full path the repository is cloned to, and where the job runs from. If the GitLab Runner `builds_dir` parameter is set, this variable is set relative to the value of `builds_dir`. For more information, see the [Advanced GitLab Runner configuration](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section). |
 | `CI_PROJECT_ID`                   | Pipeline    | all    | all    | The ID of the current project. This ID is unique across all projects on the GitLab instance. |
diff --git a/doc/tutorials/develop.md b/doc/tutorials/develop.md
index c893a4839d4..c1ec273a678 100644
--- a/doc/tutorials/develop.md
+++ b/doc/tutorials/develop.md
@@ -5,7 +5,7 @@ description: Integrations with third-party services.
 info: For assistance with this tutorials page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments-to-other-projects-and-subjects.
 ---
 
-# Tutorials: Develop with GitLab
+# Tutorials: Extend with GitLab
 
 ## Integrate with GitLab
 
diff --git a/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml
index cb8d7bceb55..5bd964339ea 100644
--- a/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  DAST_AUTO_DEPLOY_IMAGE_VERSION: 'v2.77.0'
+  DAST_AUTO_DEPLOY_IMAGE_VERSION: 'v2.78.0'
 
 .dast-auto-deploy:
   image: "${CI_TEMPLATE_REGISTRY_HOST}/gitlab-org/cluster-integration/auto-deploy-image:${DAST_AUTO_DEPLOY_IMAGE_VERSION}"
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
index 8191558c180..61ac8b01cd8 100644
--- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  AUTO_DEPLOY_IMAGE_VERSION: 'v2.77.0'
+  AUTO_DEPLOY_IMAGE_VERSION: 'v2.78.0'
 
 .auto-deploy:
   image: "${CI_TEMPLATE_REGISTRY_HOST}/gitlab-org/cluster-integration/auto-deploy-image:${AUTO_DEPLOY_IMAGE_VERSION}"
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.latest.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.latest.gitlab-ci.yml
index 09712ad664c..09075258961 100644
--- a/lib/gitlab/ci/templates/Jobs/Deploy.latest.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.latest.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  AUTO_DEPLOY_IMAGE_VERSION: 'v2.77.0'
+  AUTO_DEPLOY_IMAGE_VERSION: 'v2.78.0'
 
 .auto-deploy:
   image: "${CI_TEMPLATE_REGISTRY_HOST}/gitlab-org/cluster-integration/auto-deploy-image:${AUTO_DEPLOY_IMAGE_VERSION}"
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 230e745b80a..aefeeea191d 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8179,6 +8179,9 @@ msgstr ""
 msgid "Billing|User was successfully removed"
 msgstr ""
 
+msgid "Billing|View pending approvals"
+msgstr ""
+
 msgid "Billing|You are about to remove user %{username} from your subscription. If you continue, the user will be removed from the %{namespace} group and all its subgroups and projects. This action can't be undone."
 msgstr ""
 
@@ -56627,6 +56630,11 @@ msgstr ""
 msgid "You don’t have access to Value Stream Analytics for this group"
 msgstr ""
 
+msgid "You have %{pendingMembersCount} pending member that needs approval."
+msgid_plural "You have %{pendingMembersCount} pending members that need approval."
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "You have already reported this user"
 msgstr ""
 
diff --git a/spec/finders/ci/pipelines_finder_spec.rb b/spec/finders/ci/pipelines_finder_spec.rb
index 8773fbccdfc..e6984d2f0bc 100644
--- a/spec/finders/ci/pipelines_finder_spec.rb
+++ b/spec/finders/ci/pipelines_finder_spec.rb
@@ -259,16 +259,6 @@ RSpec.describe Ci::PipelinesFinder do
           is_expected.to be_empty
         end
       end
-
-      context 'when pipeline_name_search feature flag is off' do
-        before do
-          stub_feature_flags(pipeline_name_search: false)
-        end
-
-        it 'ignores name parameter' do
-          is_expected.to contain_exactly(pipeline, pipeline_other)
-        end
-      end
     end
 
     describe 'ordering' do
diff --git a/spec/models/integrations/jira_spec.rb b/spec/models/integrations/jira_spec.rb
index 2a3a3ec7f09..36af9c2daf7 100644
--- a/spec/models/integrations/jira_spec.rb
+++ b/spec/models/integrations/jira_spec.rb
@@ -228,9 +228,19 @@ RSpec.describe Integrations::Jira, feature_category: :integrations do
       end
     end
 
-    context 'when project_level? is false' do
+    context 'when instance_level? is false' do
       before do
-        allow(integration).to receive(:project_level?).and_return(false)
+        allow(integration).to receive(:instance_level?).and_return(false)
+      end
+
+      it 'includes SECTION_TYPE_JIRA_ISSUES' do
+        expect(sections).to include(described_class::SECTION_TYPE_JIRA_ISSUES)
+      end
+    end
+
+    context 'when instance_level? is true' do
+      before do
+        allow(integration).to receive(:instance_level?).and_return(true)
       end
 
       it 'does not include SECTION_TYPE_JIRA_ISSUES' do