Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

4 files changed, 187 insertions, 9 deletions

diff --git a/spec/fixtures/lib/gitlab/import_export/complex/project.json b/spec/fixtures/lib/gitlab/import_export/complex/project.json
index 1072e63b20b..fd4c2d55124 100644
--- a/spec/fixtures/lib/gitlab/import_export/complex/project.json
+++ b/spec/fixtures/lib/gitlab/import_export/complex/project.json
@@ -7759,7 +7759,29 @@
       "created_at": "2019-06-06T14:01:06.204Z",
       "updated_at": "2019-06-06T14:22:37.045Z",
       "name": "TestBoardABC",
-      "milestone_id": null,
+      "milestone": {
+        "id": 1,
+        "title": "test milestone",
+        "project_id": 8,
+        "description": "test milestone",
+        "due_date": null,
+        "created_at": "2016-06-14T15:02:04.415Z",
+        "updated_at": "2016-06-14T15:02:04.415Z",
+        "state": "active",
+        "iid": 1,
+        "events": [
+          {
+            "id": 487,
+            "target_type": "Milestone",
+            "target_id": 1,
+            "project_id": 46,
+            "created_at": "2016-06-14T15:02:04.418Z",
+            "updated_at": "2016-06-14T15:02:04.418Z",
+            "action": 1,
+            "author_id": 18
+          }
+        ]
+      },
       "group_id": null,
       "weight": null,
       "lists": [
@@ -7772,7 +7794,29 @@
           "created_at": "2019-06-06T14:01:06.214Z",
           "updated_at": "2019-06-06T14:01:06.214Z",
           "user_id": null,
-          "milestone_id": null
+          "milestone": {
+            "id": 1,
+            "title": "test milestone",
+            "project_id": 8,
+            "description": "test milestone",
+            "due_date": null,
+            "created_at": "2016-06-14T15:02:04.415Z",
+            "updated_at": "2016-06-14T15:02:04.415Z",
+            "state": "active",
+            "iid": 1,
+            "events": [
+              {
+                "id": 487,
+                "target_type": "Milestone",
+                "target_id": 1,
+                "project_id": 46,
+                "created_at": "2016-06-14T15:02:04.418Z",
+                "updated_at": "2016-06-14T15:02:04.418Z",
+                "action": 1,
+                "author_id": 18
+              }
+            ]
+          }
         },
         {
           "id": 61,
@@ -7783,7 +7827,29 @@
           "created_at": "2019-06-06T14:01:43.197Z",
           "updated_at": "2019-06-06T14:01:43.197Z",
           "user_id": null,
-          "milestone_id": null,
+          "milestone": {
+            "id": 1,
+            "title": "test milestone",
+            "project_id": 8,
+            "description": "test milestone",
+            "due_date": null,
+            "created_at": "2016-06-14T15:02:04.415Z",
+            "updated_at": "2016-06-14T15:02:04.415Z",
+            "state": "active",
+            "iid": 1,
+            "events": [
+              {
+                "id": 487,
+                "target_type": "Milestone",
+                "target_id": 1,
+                "project_id": 46,
+                "created_at": "2016-06-14T15:02:04.418Z",
+                "updated_at": "2016-06-14T15:02:04.418Z",
+                "action": 1,
+                "author_id": 18
+              }
+            ]
+          },
           "label": {
             "id": 20,
             "title": "testlabel",
@@ -7807,7 +7873,29 @@
           "created_at": "2019-06-06T14:01:06.221Z",
           "updated_at": "2019-06-06T14:01:06.221Z",
           "user_id": null,
-          "milestone_id": null
+          "milestone": {
+            "id": 1,
+            "title": "test milestone",
+            "project_id": 8,
+            "description": "test milestone",
+            "due_date": null,
+            "created_at": "2016-06-14T15:02:04.415Z",
+            "updated_at": "2016-06-14T15:02:04.415Z",
+            "state": "active",
+            "iid": 1,
+            "events": [
+              {
+                "id": 487,
+                "target_type": "Milestone",
+                "target_id": 1,
+                "project_id": 46,
+                "created_at": "2016-06-14T15:02:04.418Z",
+                "updated_at": "2016-06-14T15:02:04.418Z",
+                "action": 1,
+                "author_id": 18
+              }
+            ]
+          }
         }
       ]
     }
diff --git a/spec/fixtures/lib/gitlab/import_export/complex/tree/project.json b/spec/fixtures/lib/gitlab/import_export/complex/tree/project.json
index 203b0264f9e..2c5045ce806 100644
--- a/spec/fixtures/lib/gitlab/import_export/complex/tree/project.json
+++ b/spec/fixtures/lib/gitlab/import_export/complex/tree/project.json
@@ -1 +1,10 @@
-{"description":"Nisi et repellendus ut enim quo accusamus vel magnam.","import_type":"gitlab_project","creator_id":123,"visibility_level":10,"archived":false,"deploy_keys":[],"hooks":[]}
+{
+  "description": "Nisi et repellendus ut enim quo accusamus vel magnam.",
+  "import_type": "gitlab_project",
+  "creator_id": 123,
+  "visibility_level": 10,
+  "archived": false,
+  "deploy_keys": [],
+  "hooks": [],
+  "shared_runners_enabled": true
+}
diff --git a/spec/fixtures/lib/gitlab/import_export/complex/tree/project/boards.ndjson b/spec/fixtures/lib/gitlab/import_export/complex/tree/project/boards.ndjson
index ef18af69c9b..a63b583f087 100644
--- a/spec/fixtures/lib/gitlab/import_export/complex/tree/project/boards.ndjson
+++ b/spec/fixtures/lib/gitlab/import_export/complex/tree/project/boards.ndjson
@@ -1 +1 @@
-{"id":29,"project_id":49,"created_at":"2019-06-06T14:01:06.204Z","updated_at":"2019-06-06T14:22:37.045Z","name":"TestBoardABC","milestone_id":null,"group_id":null,"weight":null,"lists":[{"id":59,"board_id":29,"label_id":null,"list_type":"backlog","position":null,"created_at":"2019-06-06T14:01:06.214Z","updated_at":"2019-06-06T14:01:06.214Z","user_id":null,"milestone_id":null},{"id":61,"board_id":29,"label_id":20,"list_type":"label","position":0,"created_at":"2019-06-06T14:01:43.197Z","updated_at":"2019-06-06T14:01:43.197Z","user_id":null,"milestone_id":null,"label":{"id":20,"title":"testlabel","color":"#0033CC","project_id":49,"created_at":"2019-06-06T14:01:19.698Z","updated_at":"2019-06-06T14:01:19.698Z","template":false,"description":null,"group_id":null,"type":"ProjectLabel","priorities":[]}},{"id":60,"board_id":29,"label_id":null,"list_type":"closed","position":null,"created_at":"2019-06-06T14:01:06.221Z","updated_at":"2019-06-06T14:01:06.221Z","user_id":null,"milestone_id":null}]}
+{"id":29,"project_id":49,"created_at":"2019-06-06T14:01:06.204Z","updated_at":"2019-06-06T14:22:37.045Z","name":"TestBoardABC","group_id":null,"weight":null,"milestone":{"id":1,"title":"test milestone","project_id":8,"description":"test milestone","due_date":null,"created_at":"2016-06-14T15:02:04.415Z","updated_at":"2016-06-14T15:02:04.415Z","state":"active","iid":1,"events":[{"id":487,"target_type":"Milestone","target_id":1,"project_id":46,"created_at":"2016-06-14T15:02:04.418Z","updated_at":"2016-06-14T15:02:04.418Z","action":1,"author_id":18}]},"lists":[{"id":59,"board_id":29,"label_id":null,"list_type":"backlog","position":null,"created_at":"2019-06-06T14:01:06.214Z","updated_at":"2019-06-06T14:01:06.214Z","user_id":null,"milestone":{"id":1,"title":"test milestone","project_id":8,"description":"test milestone","due_date":null,"created_at":"2016-06-14T15:02:04.415Z","updated_at":"2016-06-14T15:02:04.415Z","state":"active","iid":1,"events":[{"id":487,"target_type":"Milestone","target_id":1,"project_id":46,"created_at":"2016-06-14T15:02:04.418Z","updated_at":"2016-06-14T15:02:04.418Z","action":1,"author_id":18}]}},{"id":61,"board_id":29,"label_id":20,"list_type":"label","position":0,"created_at":"2019-06-06T14:01:43.197Z","updated_at":"2019-06-06T14:01:43.197Z","user_id":null,"milestone":{"id":1,"title":"test milestone","project_id":8,"description":"test milestone","due_date":null,"created_at":"2016-06-14T15:02:04.415Z","updated_at":"2016-06-14T15:02:04.415Z","state":"active","iid":1,"events":[{"id":487,"target_type":"Milestone","target_id":1,"project_id":46,"created_at":"2016-06-14T15:02:04.418Z","updated_at":"2016-06-14T15:02:04.418Z","action":1,"author_id":18}]},"label":{"id":20,"title":"testlabel","color":"#0033CC","project_id":49,"created_at":"2019-06-06T14:01:19.698Z","updated_at":"2019-06-06T14:01:19.698Z","template":false,"description":null,"group_id":null,"type":"ProjectLabel","priorities":[]}},{"id":60,"board_id":29,"label_id":null,"list_type":"closed","position":null,"created_at":"2019-06-06T14:01:06.221Z","updated_at":"2019-06-06T14:01:06.221Z","user_id":null,"milestone":{"id":1,"title":"test milestone","project_id":8,"description":"test milestone","due_date":null,"created_at":"2016-06-14T15:02:04.415Z","updated_at":"2016-06-14T15:02:04.415Z","state":"active","iid":1,"events":[{"id":487,"target_type":"Milestone","target_id":1,"project_id":46,"created_at":"2016-06-14T15:02:04.418Z","updated_at":"2016-06-14T15:02:04.418Z","action":1,"author_id":18}]}}]}
diff --git a/spec/fixtures/lib/gitlab/performance_bar/peek_data.json b/spec/fixtures/lib/gitlab/performance_bar/peek_data.json
index c60e787ddb1..69512c52cbd 100644
--- a/spec/fixtures/lib/gitlab/performance_bar/peek_data.json
+++ b/spec/fixtures/lib/gitlab/performance_bar/peek_data.json
@@ -64,9 +64,90 @@
       "warnings": []
     },
     "gitaly": {
-      "duration": "0ms",
-      "calls": 0,
-      "details": [],
+      "duration": "30ms",
+      "calls": 2,
+      "details": [
+        {
+          "start": 6301.575665897,
+          "feature": "commit_service#get_tree_entries",
+          "duration": 23.709,
+          "request": "{:repository=>\n  {:storage_name=>\"nfs-file-cny01\",\n   :relative_path=>\n    \"@hashed/a6/80/a68072e80f075e89bc74a300101a9e71e8363bdb542182580162553462480a52.git\",\n   :git_object_directory=>\"\",\n   :git_alternate_object_directories=>[],\n   :gl_repository=>\"project-278964\",\n   :gl_project_path=>\"gitlab-org/gitlab\"},\n :revision=>\"master\",\n :path=>\".\",\n :sort=>:TREES_FIRST,\n :pagination_params=>{:page_token=>\"\", :limit=>100}}\n",
+          "rpc": "get_tree_entries",
+          "backtrace": [
+            "lib/gitlab/gitaly_client/call.rb:48:in `block in instrument_stream'",
+            "lib/gitlab/gitaly_client/commit_service.rb:128:in `each'",
+            "lib/gitlab/gitaly_client/commit_service.rb:128:in `each'",
+            "lib/gitlab/gitaly_client/commit_service.rb:128:in `flat_map'",
+            "lib/gitlab/gitaly_client/commit_service.rb:128:in `tree_entries'",
+            "lib/gitlab/git/tree.rb:26:in `block in tree_entries'",
+            "lib/gitlab/git/wraps_gitaly_errors.rb:7:in `wrapped_gitaly_errors'",
+            "lib/gitlab/git/tree.rb:25:in `tree_entries'",
+            "lib/gitlab/git/rugged_impl/tree.rb:29:in `tree_entries'",
+            "lib/gitlab/git/tree.rb:21:in `where'",
+            "app/models/tree.rb:17:in `initialize'",
+            "app/models/repository.rb:681:in `new'",
+            "app/models/repository.rb:681:in `tree'",
+            "app/graphql/resolvers/paginated_tree_resolver.rb:35:in `resolve'",
+            "lib/gitlab/graphql/present/field_extension.rb:18:in `resolve'",
+            "lib/gitlab/graphql/extensions/externally_paginated_array_extension.rb:7:in `resolve'",
+            "lib/gitlab/graphql/generic_tracing.rb:40:in `with_labkit_tracing'",
+            "lib/gitlab/graphql/generic_tracing.rb:30:in `platform_trace'",
+            "lib/gitlab/graphql/generic_tracing.rb:40:in `with_labkit_tracing'",
+            "lib/gitlab/graphql/generic_tracing.rb:30:in `platform_trace'",
+            "lib/gitlab/graphql/generic_tracing.rb:40:in `with_labkit_tracing'",
+            "lib/gitlab/graphql/generic_tracing.rb:30:in `platform_trace'",
+            "app/graphql/gitlab_schema.rb:40:in `multiplex'",
+            "app/controllers/graphql_controller.rb:110:in `execute_multiplex'",
+            "app/controllers/graphql_controller.rb:41:in `execute'",
+            "ee/lib/gitlab/ip_address_state.rb:10:in `with'",
+            "ee/app/controllers/ee/application_controller.rb:44:in `set_current_ip_address'",
+            "app/controllers/application_controller.rb:497:in `set_current_admin'",
+            "lib/gitlab/session.rb:11:in `with_session'",
+            "app/controllers/application_controller.rb:488:in `set_session_storage'",
+            "app/controllers/application_controller.rb:482:in `set_locale'",
+            "app/controllers/application_controller.rb:476:in `set_current_context'",
+            "ee/lib/omni_auth/strategies/group_saml.rb:41:in `other_phase'",
+            "lib/gitlab/jira/middleware.rb:19:in `call'"
+          ],
+          "warnings": []
+        }, {
+          "start": 9081.502219885,
+          "feature": "commit_service#find_commit",
+          "duration": 6.678,
+          "request": "{:repository=>\n  {:storage_name=>\"nfs-file-cny01\",\n   :relative_path=>\n    \"@hashed/a6/80/a68072e80f075e89bc74a300101a9e71e8363bdb542182580162553462480a52.git\",\n   :git_object_directory=>\"\",\n   :git_alternate_object_directories=>[],\n   :gl_repository=>\"project-278964\",\n   :gl_project_path=>\"gitlab-org/gitlab\"},\n :revision=>\"master\"}\n",
+          "rpc": "find_commit",
+          "backtrace": [
+            "lib/gitlab/gitaly_client/call.rb:30:in `call'",
+            "lib/gitlab/gitaly_client.rb:167:in `call'",
+            "lib/gitlab/gitaly_client/commit_service.rb:520:in `call_find_commit'",
+            "lib/gitlab/gitaly_client/commit_service.rb:354:in `find_commit'",
+            "lib/gitlab/git/commit.rb:74:in `block in find_commit'",
+            "lib/gitlab/git/wraps_gitaly_errors.rb:7:in `wrapped_gitaly_errors'",
+            "lib/gitlab/git/commit.rb:73:in `find_commit'",
+            "lib/gitlab/git/rugged_impl/commit.rb:41:in `find_commit'",
+            "lib/gitlab/git/commit.rb:65:in `find'",
+            "lib/gitlab/git/repository.rb:789:in `commit'",
+            "app/services/branches/diverging_commit_counts_service.rb:21:in `diverging_commit_counts'",
+            "app/services/branches/diverging_commit_counts_service.rb:11:in `call'",
+            "app/controllers/projects/branches_controller.rb:57:in `block (4 levels) in diverging_commit_counts'",
+            "app/controllers/projects/branches_controller.rb:57:in `to_h'",
+            "app/controllers/projects/branches_controller.rb:57:in `block (3 levels) in diverging_commit_counts'",
+            "lib/gitlab/gitaly_client.rb:325:in `allow_n_plus_1_calls'",
+            "app/controllers/projects/branches_controller.rb:56:in `block (2 levels) in diverging_commit_counts'",
+            "app/controllers/projects/branches_controller.rb:51:in `diverging_commit_counts'",
+            "ee/lib/gitlab/ip_address_state.rb:10:in `with'",
+            "ee/app/controllers/ee/application_controller.rb:44:in `set_current_ip_address'",
+            "app/controllers/application_controller.rb:497:in `set_current_admin'",
+            "lib/gitlab/session.rb:11:in `with_session'",
+            "app/controllers/application_controller.rb:488:in `set_session_storage'",
+            "app/controllers/application_controller.rb:482:in `set_locale'",
+            "app/controllers/application_controller.rb:476:in `set_current_context'",
+            "ee/lib/omni_auth/strategies/group_saml.rb:41:in `other_phase'",
+            "lib/gitlab/jira/middleware.rb:19:in `call'"
+          ],
+          "warnings": []
+        }
+      ],
       "warnings": []
     },
     "redis": {