Add latest changes from gitlab-org/gitlab@master

app/views/projects/wikis/_form.html.haml

@@ -27,7 +27,9 @@
   .form-group.row
     .col-sm-12= f.label :format, class: 'control-label-full-width'
     .col-sm-12
-      = f.select :format, options_for_select(ProjectWiki::MARKUPS, {selected: @page.format}), {}, class: 'form-control'
+      .select-wrapper
+        = f.select :format, options_for_select(ProjectWiki::MARKUPS, {selected: @page.format}), {}, class: 'form-control select-control'
+        = icon('chevron-down')
   .form-group.row
     .col-sm-12= f.label :content, class: 'control-label-full-width'

changelogs/unreleased/196843-remove-feature-flag.yml

+---
+title: Container Registry tag expiration policy settings
+merge_request: 25123
+author:
+type: added

changelogs/unreleased/34353-graphql-mutation-update-image-diff-note.yml

+---
+title: Add updateImageDiffNote mutation
+merge_request: 24027
+author:
+type: added

changelogs/unreleased/36505-nuget-the-search-service.yml

+---
+title: Add specialized index to packages_packages database table
+merge_request: 24182
+author:
+type: other

changelogs/unreleased/Updated-new-edit-wiki-page-to-equal-ui-elements.yml

+---
+title: Updated ui elements in wiki page creation
+merge_request: 25197
+author: Marc Schwede
+type: other

changelogs/unreleased/bvl-correct-thread-count.yml

+---
+title: Fix sidekiq jobs not always getting a database connection when running with low concurrency
+merge_request: 25261
+author:
+type: fixed

changelogs/unreleased/fix-blocked-status.yml

+---
+title: Show blocked status for all blocked issues on issue boards
+merge_request: 24631
+author:
+type: fixed

changelogs/unreleased/fix-wrong-mr-id-in-pipeline-failure-email.yml

+---
+title: Fix wrong MR link is shown on pipeline failure email
+merge_request:
+author:
+type: fixed

changelogs/unreleased/fj-39199-create-snippet-repository.yml

+---
+title: Create snippet repository when it's created
+merge_request: 22269
+author:
+type: added

changelogs/unreleased/refactoring-entities-file-final.yml

+---
+title: Separate project entity into own class file
+merge_request: 25297
+author: Rajendra Kadam
+type: added

db/migrate/20200207090921_add_nuget_index_to_packages_packages.rb

+# frozen_string_literal: true
+
+class AddNugetIndexToPackagesPackages < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_packages_project_id_name_partial_for_nuget'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :packages_packages, [:project_id, :name], name: INDEX_NAME, where: "name <> 'NuGet.Temporary.Package' AND version is not null AND package_type = 4"
+  end
+
+  def down
+    remove_concurrent_index_by_name :packages_packages, INDEX_NAME
+  end
+end

db/schema.rb

@@ -3012,6 +3012,7 @@ ActiveRecord::Schema.define(version: 2020_02_13_204737) do
     t.index ["name"], name: "index_packages_packages_on_name_trigram", opclass: :gin_trgm_ops, using: :gin
     t.index ["project_id", "created_at"], name: "index_packages_packages_on_project_id_and_created_at"
     t.index ["project_id", "name", "version", "package_type"], name: "idx_packages_packages_on_project_id_name_version_package_type"
+    t.index ["project_id", "name"], name: "index_packages_project_id_name_partial_for_nuget", where: "(((name)::text <> 'NuGet.Temporary.Package'::text) AND (version IS NOT NULL) AND (package_type = 4))"
     t.index ["project_id", "package_type"], name: "index_packages_packages_on_project_id_and_package_type"
     t.index ["project_id", "version"], name: "index_packages_packages_on_project_id_and_version"
   end

doc/api/graphql/reference/gitlab_schema.graphql

@@ -1406,12 +1406,12 @@ input DiffImagePositionInput {
   width: Int!
   """
-  X position on which the comment was made
+  X position of the note
   """
   x: Int!
   """
-  Y position on which the comment was made
+  Y position of the note
   """
   y: Int!
 }
@@ -1475,12 +1475,12 @@ type DiffPosition {
   width: Int
   """
-  X position on which the comment was made
+  X position of the note
   """
   x: Int
   """
-  Y position on which the comment was made
+  Y position of the note
   """
   y: Int
 }
@@ -4660,6 +4660,18 @@ type Mutation {
   todosMarkAllDone(input: TodosMarkAllDoneInput!): TodosMarkAllDonePayload
   toggleAwardEmoji(input: ToggleAwardEmojiInput!): ToggleAwardEmojiPayload
   updateEpic(input: UpdateEpicInput!): UpdateEpicPayload
+
+  """
+  Updates a DiffNote on an image (a `Note` where the `position.positionType` is
+  `"image"`). If the body of the Note contains only quick actions, the Note will
+  be destroyed during the update, and no Note will be returned
+  """
+  updateImageDiffNote(input: UpdateImageDiffNoteInput!): UpdateImageDiffNotePayload
+
+  """
+  Updates a Note. If the body of the Note contains only quick actions, the Note
+  will be destroyed during the update, and no Note will be returned
+  """
   updateNote(input: UpdateNoteInput!): UpdateNotePayload
   updateSnippet(input: UpdateSnippetInput!): UpdateSnippetPayload
 }
@@ -7533,6 +7545,28 @@ enum TypeEnum {
   project
 }
+input UpdateDiffImagePositionInput {
+  """
+  Total height of the image
+  """
+  height: Int
+
+  """
+  Total width of the image
+  """
+  width: Int
+
+  """
+  X position of the note
+  """
+  x: Int
+
+  """
+  Y position of the note
+  """
+  y: Int
+}
+
 """
 Autogenerated input type of UpdateEpic
 """
@@ -7618,6 +7652,51 @@ type UpdateEpicPayload {
   errors: [String!]!
 }
+"""
+Autogenerated input type of UpdateImageDiffNote
+"""
+input UpdateImageDiffNoteInput {
+  """
+  Content of the note
+  """
+  body: String
+
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  The global id of the note to update
+  """
+  id: ID!
+
+  """
+  The position of this note on a diff
+  """
+  position: UpdateDiffImagePositionInput
+}
+
+"""
+Autogenerated return type of UpdateImageDiffNote
+"""
+type UpdateImageDiffNotePayload {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  Reasons why the mutation failed.
+  """
+  errors: [String!]!
+
+  """
+  The note after mutation
+  """
+  note: Note
+}
+
 """
 Autogenerated input type of UpdateNote
 """

doc/api/graphql/reference/gitlab_schema.json

@@ -8063,7 +8063,7 @@
             },
             {
               "name": "x",
-              "description": "X position on which the comment was made",
+              "description": "X position of the note",
               "args": [
               ],
@@ -8077,7 +8077,7 @@
             },
             {
               "name": "y",
-              "description": "Y position on which the comment was made",
+              "description": "Y position of the note",
               "args": [
               ],
@@ -19426,9 +19426,36 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "updateImageDiffNote",
+              "description": "Updates a DiffNote on an image (a `Note` where the `position.positionType` is `\"image\"`). If the body of the Note contains only quick actions, the Note will be destroyed during the update, and no Note will be returned",
+              "args": [
+                {
+                  "name": "input",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "UpdateImageDiffNoteInput",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "UpdateImageDiffNotePayload",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "updateNote",
-              "description": null,
+              "description": "Updates a Note. If the body of the Note contains only quick actions, the Note will be destroyed during the update, and no Note will be returned",
               "args": [
                 {
                   "name": "input",
@@ -21640,7 +21667,7 @@
             },
             {
               "name": "x",
-              "description": "X position on which the comment was made",
+              "description": "X position of the note",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -21654,7 +21681,7 @@
             },
             {
               "name": "y",
-              "description": "Y position on which the comment was made",
+              "description": "Y position of the note",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -21815,6 +21842,179 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "UpdateImageDiffNotePayload",
+          "description": "Autogenerated return type of UpdateImageDiffNote",
+          "fields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "errors",
+              "description": "Reasons why the mutation failed.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "note",
+              "description": "The note after mutation",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Note",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "UpdateImageDiffNoteInput",
+          "description": "Autogenerated input type of UpdateImageDiffNote",
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "id",
+              "description": "The global id of the note to update",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "ID",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "body",
+              "description": "Content of the note",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "position",
+              "description": "The position of this note on a diff",
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "UpdateDiffImagePositionInput",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "UpdateDiffImagePositionInput",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "x",
+              "description": "X position of the note",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "y",
+              "description": "Y position of the note",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "width",
+              "description": "Total width of the image",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "height",
+              "description": "Total height of the image",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "DestroyNotePayload",

doc/api/graphql/reference/index.md

@@ -246,8 +246,8 @@ Autogenerated return type of DestroySnippet
 | `oldPath` | String | Path of the file on the start SHA |
 | `positionType` | DiffPositionType! | Type of file the position refers to |
 | `width` | Int | Total width of the image |
-| `x` | Int | X position on which the comment was made |
-| `y` | Int | Y position on which the comment was made |
+| `x` | Int | X position of the note |
+| `y` | Int | Y position of the note |
 ## DiffRefs
@@ -1230,6 +1230,16 @@ Autogenerated return type of UpdateEpic
 | `epic` | Epic | The epic after mutation |
 | `errors` | String! => Array | Reasons why the mutation failed. |
+## UpdateImageDiffNotePayload
+
+Autogenerated return type of UpdateImageDiffNote
+
+| Name  | Type  | Description |
+| ---   |  ---- | ----------  |
+| `clientMutationId` | String | A unique identifier for the client performing the mutation. |
+| `errors` | String! => Array | Reasons why the mutation failed. |
+| `note` | Note | The note after mutation |
+
 ## UpdateNotePayload
 Autogenerated return type of UpdateNote

doc/user/analytics/productivity_analytics.md

@@ -25,10 +25,7 @@ Productivity Analytics allows GitLab users to:
 ## Accessing metrics and visualizations
-To access the **Productivity Analytics** page:
-
-1. Go to **Analytics** from the top navigation bar.
-1. Select **Productivity Analytics** from the menu.
+To access the chart, navigate to a group's sidebar and select **Analytics > Productivity Analytics**.
 The following metrics and visualizations are available on a project or group level - currently only covering **merged** merge requests:

doc/user/application_security/index.md

@@ -112,6 +112,7 @@ automatically generates. The following scanners are supported:
 - [Dependency Scanning](dependency_scanning/index.md):
   Automatic Patch creation is only available for Node.js projects managed with
   `yarn`.
+- [Container Scanning](container_scanning/index.md)
 #### Manually applying the suggested patch

doc/user/project/issues/design_management.md

@@ -144,8 +144,10 @@ which you can start a new discussion:
 ![Starting a new discussion on design](img/adding_note_to_design_1.png)
-From GitLab 12.8 on, when you are starting a new discussion, you can adjust the badge's position by
-dragging it around the image.
+[Introduced](https://gitlab.com/gitlab-org/gitlab/issues/34353) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.8,
+you can adjust the badge's position by dragging it around the image. This is useful
+for when your design layout has changed between revisions, or if you need to move an
+existing badge to add a new one in its place.
 Different discussions have different badge numbers:

lib/api/entities/application_setting.rb

@@ -34,3 +34,5 @@ module API
     end
   end
 end
+
+API::Entities::ApplicationSetting.prepend_if_ee('EE::API::Entities::ApplicationSetting')