Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/services/ci/create_pipeline_service.rb

@@ -161,7 +161,7 @@ def build_logger
           pipeline_includes_count = observations['pipeline_includes_count']
           next false unless pipeline_includes_count
 
-          pipeline_includes_count.to_i > Gitlab::Ci::Config::External::Context::MAX_INCLUDES
+          pipeline_includes_count.to_i > Gitlab::Ci::Config::External::Context::TEMP_MAX_INCLUDES
         end
       end
     end

config/feature_flags/development/ci_includes_count_duplicates.yml

@@ -69,7 +69,7 @@
   self-managed: false
   gitlab-com: true
   available_in: [Ultimate]
-  documentation_link: https://release-15-9.about.gitlab-review.app/direction/modelops/ai_assisted/code_suggestions/
+  documentation_link: https://about.gitlab.com/releases/2023/02/22/gitlab-15-9-released/#code-suggestions-available-in-closed-beta
   image_url: https://about.gitlab.com/images/15_9/DemoFastApi.gif
   published_at: 2023-02-02  # YYYY-MM-DD
   release: 15.9

data/whats_new/20230222001_15_09.yml

@@ -65,6 +65,7 @@ GET /projects/:id/issues/:issue_iid/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Issue",
+        "project_id": 5,
         "noteable_iid": null
       },
       {
@@ -85,6 +86,7 @@ GET /projects/:id/issues/:issue_iid/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Issue",
+        "project_id": 5,
         "noteable_iid": null,
         "resolvable": false
       }
@@ -112,6 +114,7 @@ GET /projects/:id/issues/:issue_iid/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Issue",
+        "project_id": 5,
         "noteable_iid": null,
         "resolvable": false
       }
@@ -279,6 +282,7 @@ GET /projects/:id/snippets/:snippet_id/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Snippet",
+        "project_id": 5,
         "noteable_iid": null
       },
       {
@@ -299,6 +303,7 @@ GET /projects/:id/snippets/:snippet_id/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Snippet",
+        "project_id": 5,
         "noteable_iid": null,
         "resolvable": false
       }
@@ -326,6 +331,7 @@ GET /projects/:id/snippets/:snippet_id/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Snippet",
+        "project_id": 5,
         "noteable_iid": null,
         "resolvable": false
       }
@@ -491,6 +497,7 @@ GET /groups/:id/epics/:epic_id/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Epic",
+        "project_id": 5,
         "noteable_iid": null,
         "resolvable": false
       },
@@ -512,6 +519,7 @@ GET /groups/:id/epics/:epic_id/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Epic",
+        "project_id": 5,
         "noteable_iid": null,
         "resolvable": false
       }
@@ -539,6 +547,7 @@ GET /groups/:id/epics/:epic_id/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Epic",
+        "project_id": 5,
         "noteable_iid": null,
         "resolvable": false
       }
@@ -705,6 +714,7 @@ GET /projects/:id/merge_requests/:merge_request_iid/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Merge request",
+        "project_id": 5,
         "noteable_iid": null,
         "resolved": false,
         "resolvable": true,
@@ -729,6 +739,7 @@ GET /projects/:id/merge_requests/:merge_request_iid/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Merge request",
+        "project_id": 5,
         "noteable_iid": null,
         "resolved": false,
         "resolvable": true,
@@ -758,6 +769,7 @@ GET /projects/:id/merge_requests/:merge_request_iid/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Merge request",
+        "project_id": 5,
         "noteable_iid": null,
         "resolved": false,
         "resolvable": true,
@@ -794,6 +806,7 @@ Diff comments also contain position:
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Merge request",
+        "project_id": 5,
         "noteable_iid": null,
         "commit_id": "4803c71e6b1833ca72b8b26ef2ecd5adc8a38031",
         "position": {
@@ -1137,6 +1150,7 @@ GET /projects/:id/repository/commits/:commit_id/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Commit",
+        "project_id": 5,
         "noteable_iid": null,
         "resolvable": false
       },
@@ -1158,6 +1172,7 @@ GET /projects/:id/repository/commits/:commit_id/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Commit",
+        "project_id": 5,
         "noteable_iid": null,
         "resolvable": false
       }
@@ -1185,6 +1200,7 @@ GET /projects/:id/repository/commits/:commit_id/discussions
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Commit",
+        "project_id": 5,
         "noteable_iid": null,
         "resolvable": false
       }
@@ -1219,6 +1235,7 @@ Diff comments contain also position:
         "system": false,
         "noteable_id": 3,
         "noteable_type": "Commit",
+        "project_id": 5,
         "noteable_iid": null,
         "position": {
           "base_sha": "b5d6e7b1613fca24d250fa8e5bc7bcc3dd6002ef",

doc/api/discussions.md

@@ -78,6 +78,7 @@ GET /projects/:id/issues/:issue_iid/notes?sort=asc&order_by=updated_at
     "system": true,
     "noteable_id": 377,
     "noteable_type": "Issue",
+    "project_id": 5,
     "noteable_iid": 377,
     "resolvable": false,
     "confidential": false,
@@ -100,6 +101,7 @@ GET /projects/:id/issues/:issue_iid/notes?sort=asc&order_by=updated_at
     "system": true,
     "noteable_id": 121,
     "noteable_type": "Issue",
+    "project_id": 5,
     "noteable_iid": 121,
     "resolvable": false,
     "confidential": true,
@@ -239,9 +241,9 @@ Parameters:
 
 ```json
 {
-  "id": 52,
-  "title": "Snippet",
-  "file_name": "snippet.rb",
+  "id": 302,
+  "body": "closed",
+  "attachment": null,
   "author": {
     "id": 1,
     "username": "pipin",
@@ -250,9 +252,16 @@ Parameters:
     "state": "active",
     "created_at": "2013-09-30T13:46:01Z"
   },
-  "expires_at": null,
-  "updated_at": "2013-10-02T07:34:20Z",
-  "created_at": "2013-10-02T07:34:20Z"
+  "created_at": "2013-10-02T09:22:45Z",
+  "updated_at": "2013-10-02T10:22:45Z",
+  "system": true,
+  "noteable_id": 377,
+  "noteable_type": "Issue",
+  "project_id": 5,
+  "noteable_iid": 377,
+  "resolvable": false,
+  "confidential": false,
+  "internal": false
 }
 ```
 
@@ -379,6 +388,7 @@ Parameters:
   "system": false,
   "noteable_id": 2,
   "noteable_type": "MergeRequest",
+  "project_id": 5,
   "noteable_iid": 2,
   "resolvable": false,
   "confidential": false,
@@ -501,9 +511,9 @@ Parameters:
 
 ```json
 {
-  "id": 52,
-  "title": "Epic",
-  "file_name": "epic.rb",
+  "id": 302,
+  "body": "Epic note",
+  "attachment": null,
   "author": {
     "id": 1,
     "username": "pipin",
@@ -512,9 +522,14 @@ Parameters:
     "state": "active",
     "created_at": "2013-09-30T13:46:01Z"
   },
-  "expires_at": null,
-  "updated_at": "2013-10-02T07:34:20Z",
-  "created_at": "2013-10-02T07:34:20Z",
+  "created_at": "2013-10-02T09:22:45Z",
+  "updated_at": "2013-10-02T10:22:45Z",
+  "system": true,
+  "noteable_id": 11,
+  "noteable_type": "Epic",
+  "project_id": 5,
+  "noteable_iid": 11,
+  "resolvable": false,
   "confidential": false,
   "internal": false
 }

doc/api/notes.md

@@ -407,6 +407,7 @@ Example response:
     "system": false,
     "noteable_id": 22,
     "noteable_type": "Issue",
+    "project_id": 6,
     "noteable_iid": 2
   }
 ]
@@ -796,6 +797,7 @@ Example response:
     "system": false,
     "noteable_id": 22,
     "noteable_type": "Issue",
+    "project_id": 6,
     "noteable_iid": 2
   }
 ]
@@ -1046,6 +1048,7 @@ Example response:
     "system": false,
     "noteable_id": 22,
     "noteable_type": "Issue",
+    "project_id": 6,
     "noteable_iid": 2
   }
 ]

doc/api/search.md

@@ -281,7 +281,7 @@ Use:
 - The `project` keyword to specify the full path to the downstream project.
   In [GitLab 15.3 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/367660),
   you can use [variable expansion](../variables/where_variables_can_be_used.md#gitlab-ciyml-file).
-- The `branch` keyword to specify the name of a branch or [tag](../../topics/git/tags.md)
+- The `branch` keyword to specify the name of a branch or [tag](../../user/project/repository/tags/index.md)
   in the project specified by `project`. You can use variable expansion.
 
 ## Trigger a multi-project pipeline by using the API

doc/ci/pipelines/downstream_pipelines.md

@@ -43,7 +43,7 @@ The following resources can help you get started with Git:
 - [Git stash](stash.md)
 - [Git file blame](../../user/project/repository/git_blame.md)
 - [Git file history](../../user/project/repository/git_history.md)
-- [Git tags](tags.md)
+- [Git tags](../../user/project/repository/tags/index.md)
 
 ### Concepts
 

doc/topics/git/index.md

@@ -1,41 +1,11 @@
 ---
-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
+redirect_to: '../../user/project/repository/tags/index.md'
+remove_date: '2023-05-27'
 ---
 
-# Tags **(FREE)**
+This document was moved to [another location](../../user/project/repository/tags/index.md).
 
-Tags help you mark certain deployments and releases for later
-reference. Git supports two types of tags:
-
-- Annotated tags: An unchangeable part of Git history.
-- Lightweight (soft) tags: Tags that can be set and removed as needed.
-
-Many projects combine an annotated release tag with a stable branch. Consider
-setting deployment or release tags automatically.
-
-## Tags sample workflow
-
-1. Create a lightweight tag.
-1. Create an annotated tag.
-1. Push the tags to the remote repository.
-
-```shell
-git checkout master
-
-# Lightweight tag
-git tag my_lightweight_tag
-
-# Annotated tag
-git tag -a v1.0 -m 'Version 1.0'
-
-# Show list of the existing tags
-git tag
-
-git push origin --tags
-```
-
-## Related topics
-
-- [Tagging](https://git-scm.com/book/en/v2/Git-Basics-Tagging) Git reference page
+<!-- This redirect file can be deleted after <2023-05-27>. -->
+<!-- Redirects that point to other docs in the same project expire in three months. -->
+<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->

doc/topics/git/tags.md

@@ -84,8 +84,9 @@ or API. However, administrators can use a workaround:
    # Set the group group you want to create a token for. For example, group with ID 109.
    group = Group.find(109)
 
-   # Create the group bot user. For further group access tokens, the username should be group_#{group.id}_bot#{bot_count}. For example, group_109_bot2 and email address group_109_bot_{random_string}@example.com.
-   bot = Users::CreateService.new(admin, { name: 'group_token', username: "group_#{group.id}_bot", email: "group_#{group.id}[email protected]", user_type: :project_bot }).execute
+   # Create the group bot user. For further group access tokens, the username should be `group_{group_id}_bot_{random_string}` and email address `group_{group_id}_bot_{random_string}@noreply.{Gitlab.config.gitlab.host}`.
+   random_string = SecureRandom.hex(8)
+   bot = Users::CreateService.new(admin, { name: 'group_token', username: "group_#{group.id}_bot_#{random_string}", email: "group_#{group.id}_bot_#{random_string}@noreply.#{Gitlab.config.gitlab.host}", user_type: :project_bot }).execute
 
    # Confirm the group bot.
    bot.confirm
@@ -169,8 +170,8 @@ to groups instead of projects. Bot users for groups:
 - Do not count as licensed seats.
 - Can have a maximum role of Owner for a group. For more information, see
   [Create a group access token](../../../api/group_access_tokens.md#create-a-group-access-token).
-- Have a username set to `group_{group_id}_bot_{random_string}`. For example, `group_123_bot_4ffca233d8298ea1`.  
-- Have an email set to `group{group_id}_bot_{random_string}@noreply.{Gitlab.config.gitlab.host}`. For example, `group123_bot_4ffca233d8298ea1@noreply.example.com`.
+- Have a username set to `group_{group_id}_bot_{random_string}`. For example, `group_123_bot_4ffca233d8298ea1`.
+- Have an email set to `group_{group_id}_bot_{random_string}@noreply.{Gitlab.config.gitlab.host}`. For example, `group_123_bot_4ffca233d8298ea1@noreply.example.com`.
 
 All other properties are similar to [bot users for projects](../../project/settings/project_access_tokens.md#bot-users-for-projects).
 

doc/user/group/settings/group_access_tokens.md

@@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Protected tags **(FREE)**
 
-Protected tags:
+Protected [tags](repository/tags/index.md):
 
 - Allow control over who has permission to create tags.
 - Prevent accidental update or deletion once created.
@@ -106,6 +106,11 @@ Protected tags can only be deleted by using GitLab either from the UI or API.
 These protections prevent you from accidentally deleting a tag through local
 Git commands or third-party Git clients.
 
+## Related topics
+
+- [Protected Tags API](../../api/protected_tags.md)
+- [Tags API](../../api/tags.md)
+
 <!-- ## Troubleshooting
 
 Include any troubleshooting steps that you can foresee. If you know beforehand what issues

doc/user/project/protected_tags.md

@@ -88,7 +88,7 @@ To create a release in the Releases page:
    - [Title](release_fields.md#title).
    - [Milestones](#associate-milestones-with-a-release).
    - [Release notes](release_fields.md#release-notes-description).
-   - Whether or not to include the [Tag message](../../../topics/git/tags.md).
+   - Whether or not to include the [Tag message](../repository/tags/index.md).
    - [Asset links](release_fields.md#links).
 1. Select **Create release**.