Add latest changes from gitlab-org/gitlab@master

app/graphql/types/commit_type.rb

@@ -40,7 +40,7 @@ module Types
           type: Types::Ci::PipelineType,
           null: true,
           description: "Latest pipeline of the commit",
-          deprecation_reason: 'use pipelines',
+          deprecation_reason: 'Use pipelines',
           resolver: Resolvers::CommitPipelinesResolver.last
   end
 end

changelogs/unreleased/geo-http-check.yml

+---
+title: Replace Net::HTTP with Gitlab::HTTP in rake gitlab:geo:check
+merge_request: 23741
+author: Rajendra Kadam
+type: added

doc/api/graphql/reference/gitlab_schema.graphql

@@ -203,7 +203,7 @@ type Commit {
     Filter pipelines by their status
     """
     status: PipelineStatusEnum
-  ): Pipeline @deprecated(reason: "use pipelines")
+  ): Pipeline @deprecated(reason: "Use pipelines")
   """
   Raw commit message
@@ -2172,9 +2172,9 @@ type EpicIssue implements Noteable {
   designCollection: DesignCollection
   """
-  Deprecated. Use `design_collection`
+  Deprecated. Use `designCollection`
   """
-  designs: DesignCollection @deprecated(reason: "use design_collection")
+  designs: DesignCollection @deprecated(reason: "Use designCollection")
   """
   Indicates discussion is locked on the issue
@@ -3062,9 +3062,9 @@ type Issue implements Noteable {
   designCollection: DesignCollection
   """
-  Deprecated. Use `design_collection`
+  Deprecated. Use `designCollection`
   """
-  designs: DesignCollection @deprecated(reason: "use design_collection")
+  designs: DesignCollection @deprecated(reason: "Use designCollection")
   """
   Indicates discussion is locked on the issue

doc/api/graphql/reference/gitlab_schema.json

@@ -8712,7 +8712,7 @@
             },
             {
               "name": "designs",
-              "description": "Deprecated. Use `design_collection`",
+              "description": "Deprecated. Use `designCollection`",
               "args": [
               ],
@@ -8722,7 +8722,7 @@
                 "ofType": null
               },
               "isDeprecated": true,
-              "deprecationReason": "use design_collection"
+              "deprecationReason": "Use designCollection"
             },
             {
               "name": "discussionLocked",
@@ -10255,7 +10255,7 @@
             },
             {
               "name": "designs",
-              "description": "Deprecated. Use `design_collection`",
+              "description": "Deprecated. Use `designCollection`",
               "args": [
               ],
@@ -10265,7 +10265,7 @@
                 "ofType": null
               },
               "isDeprecated": true,
-              "deprecationReason": "use design_collection"
+              "deprecationReason": "Use designCollection"
             },
             {
               "name": "discussionLocked",
@@ -13092,7 +13092,7 @@
                 "ofType": null
               },
               "isDeprecated": true,
-              "deprecationReason": "use pipelines"
+              "deprecationReason": "Use pipelines"
             },
             {
               "name": "message",

doc/api/graphql/reference/index.md

@@ -9,6 +9,7 @@
 This documentation is self-generated based on GitLab current GraphQL schema.
 The API can be explored interactively using the [GraphiQL IDE](../index.md#graphiql).
+
 Each table below documents a GraphQL type. Types match loosely to models, but not all
 fields and methods on a model are available via GraphQL.
@@ -334,7 +335,7 @@ Relationship between an epic and an issue
 | `description` | String | Description of the issue |
 | `descriptionHtml` | String | The GitLab Flavored Markdown rendering of `description` |
 | `designCollection` | DesignCollection | Collection of design images associated with this issue |
-| `designs` | DesignCollection | Deprecated. Use `design_collection` |
+| `designs` | DesignCollection | Deprecated. Use `designCollection` |
 | `discussionLocked` | Boolean! | Indicates discussion is locked on the issue |
 | `downvotes` | Int! | Number of downvotes the issue has received |
 | `dueDate` | Time | Due date of the issue |
@@ -454,7 +455,7 @@ Autogenerated return type of EpicTreeReorder
 | `description` | String | Description of the issue |
 | `descriptionHtml` | String | The GitLab Flavored Markdown rendering of `description` |
 | `designCollection` | DesignCollection | Collection of design images associated with this issue |
-| `designs` | DesignCollection | Deprecated. Use `design_collection` |
+| `designs` | DesignCollection | Deprecated. Use `designCollection` |
 | `discussionLocked` | Boolean! | Indicates discussion is locked on the issue |
 | `downvotes` | Int! | Number of downvotes the issue has received |
 | `dueDate` | Time | Due date of the issue |

doc/user/profile/notifications.md

@@ -196,9 +196,11 @@ If an open merge request becomes unmergeable due to conflict, its author will be
 If a user has also set the merge request to automatically merge once pipeline succeeds,
 then that user will also be notified.
-## Email Headers
-Notification emails include headers that provide extra content about the notification received:
+## Filtering email
+Notification email messages include GitLab-specific headers. You can filter the notification emails based on the content of these headers to better manage your notifications. For example, you could filter all emails for a specific project where you are being assigned either a merge request or issue.
+
+The following table lists all GitLab-specific email headers:
 | Header                      | Description                                                             |
 |-----------------------------|-------------------------------------------------------------------------|
@@ -209,23 +211,21 @@ Notification emails include headers that provide extra content about the notific
 | X-GitLab-Discussion-ID      | Only in comment emails, the ID of the thread the comment is from    |
 | X-GitLab-Pipeline-Id        | Only in pipeline emails, the ID of the pipeline the notification is for |
 | X-GitLab-Reply-Key          | A unique token to support reply by email                                |
-| X-GitLab-NotificationReason | The reason for being notified. "mentioned", "assigned", etc             |
+| X-GitLab-NotificationReason | The reason for being notified: one of `mentioned`, `assigned`, or `own_activity` |
 | List-Id                     | The path of the project in a RFC 2919 mailing list identifier useful for email organization, for example, with Gmail filters |
 ### X-GitLab-NotificationReason
-This header holds the reason for the notification to have been sent out,
-where reason can be `mentioned`, `assigned`, `own_activity`, etc.
-Only one reason is sent out according to its priority:
+The `X-GitLab-NotificationReason` header contains the reason for the notification. The value is one of the the following, in order of priority:
 - `own_activity`
 - `assigned`
 - `mentioned`
-The reason in this header will also be shown in the footer of the notification email. For example an email with the
+The reason for the notification is also included in the footer of the notification email. For example an email with the
 reason `assigned` will have this sentence in the footer:
-`"You are receiving this email because you have been assigned an item on {configured GitLab hostname}"`
+
+- `You are receiving this email because you have been assigned an item on <configured GitLab hostname>.`
 NOTE: **Note:**
-Only reasons listed above have been implemented so far.
-Further implementation is [being discussed](https://gitlab.com/gitlab-org/gitlab/issues/20689).
+Notification of other events is being considered for inclusion in the `X-GitLab-NotificationReason` header. For details, see this [related issue](https://gitlab.com/gitlab-org/gitlab/issues/20689).

doc/user/project/issue_board.md

@@ -423,7 +423,7 @@ something between lists by changing a label.
 A typical workflow of using the Issue Board would be:
-1. You have [created](labels.md#creating-labels) and [prioritized](labels.md#label-priority)
+1. You have [created](labels.md#label-management) and [prioritized](labels.md#label-priority)
    labels so that you can easily categorize your issues.
 1. You have a bunch of issues (ideally labeled).
 1. You visit the Issue Board and start [creating lists](#creating-a-new-list) to

doc/user/search/index.md

@@ -33,8 +33,15 @@ Follow these steps to filter the **Issues** and **Merge Requests** list pages wi
 groups:
 1. Click in the field **Search or filter results...**.
-1. In the dropdown menu that appears, select the attribute you wish to filter by (for example,
-   author, assignee, milestone, and so on).
+1. In the dropdown menu that appears, select the attribute you wish to filter by:
+   - Author
+   - Assignee
+   - [Milestone](../project/milestones/index.md)
+   - Release
+   - [Label](../project/labels.md)
+   - My-reaction
+   - Confidential
+   - Search for this text
 1. Select or type the operator to use for filtering the attribute. The following operators are
    available:
    - `=`: Is

lib/gitlab/graphql/docs/templates/default.md.haml

@@ -9,8 +9,8 @@
   The API can be explored interactively using the [GraphiQL IDE](../index.md#graphiql).
-Each table below documents a GraphQL type. Types match loosely to models, but not all
-fields and methods on a model are available via GraphQL.
+  Each table below documents a GraphQL type. Types match loosely to models, but not all
+  fields and methods on a model are available via GraphQL.
 \
 - objects.each do |type|
   - unless type[:fields].empty?