Add latest changes from gitlab-org/gitlab@master

14 files changed, 185 insertions, 52 deletions

diff --git a/spec/fixtures/group.json b/spec/fixtures/group.json
new file mode 100644
index 00000000000..86de34e2f3b
--- /dev/null
+++ b/spec/fixtures/group.json
@@ -0,0 +1 @@
+{"name":"H5bp","path":"h5bp","owner_id":null,"created_at":"2020-01-09 12:08:57 UTC","updated_at":"2020-01-09 12:08:57 UTC","description":"A voluptate non sequi temporibus quam at.","avatar":{"url":null},"membership_lock":false,"share_with_group_lock":false,"visibility_level":20,"request_access_enabled":true,"ldap_sync_status":"ready","ldap_sync_error":null,"ldap_sync_last_update_at":null,"ldap_sync_last_successful_update_at":null,"ldap_sync_last_sync_at":null,"lfs_enabled":null,"parent_id":null,"repository_size_limit":null,"require_two_factor_authentication":false,"two_factor_grace_period":48,"plan_id":null,"project_creation_level":2,"file_template_project_id":null,"saml_discovery_token":"JZGRJbe3","custom_project_templates_group_id":null,"auto_devops_enabled":null,"last_ci_minutes_notification_at":null,"last_ci_minutes_usage_notification_level":null,"subgroup_creation_level":1,"emails_disabled":null,"max_pages_size":null,"max_artifacts_size":null,"mentions_disabled":null,"milestones":[],"badges":[],"labels":[{"id":69,"title":"Amfunc","color":"#2658d0","project_id":null,"created_at":"2020-01-09T12:08:57.693Z","updated_at":"2020-01-09T12:08:57.693Z","template":false,"description":null,"group_id":28,"type":"GroupLabel","priorities":[],"textColor":"#FFFFFF"},{"id":68,"title":"Aquacell","color":"#f658e0","project_id":null,"created_at":"2020-01-09T12:08:57.688Z","updated_at":"2020-01-09T12:08:57.688Z","template":false,"description":null,"group_id":28,"type":"GroupLabel","priorities":[],"textColor":"#333333"},{"id":62,"title":"Bryns","color":"#16f0b9","project_id":null,"created_at":"2020-01-09T12:08:57.672Z","updated_at":"2020-01-09T12:08:57.672Z","template":false,"description":null,"group_id":28,"type":"GroupLabel","priorities":[],"textColor":"#FFFFFF"},{"id":61,"title":"Pephfunc","color":"#556319","project_id":null,"created_at":"2020-01-09T12:08:57.669Z","updated_at":"2020-01-09T12:08:57.669Z","template":false,"description":null,"group_id":28,"type":"GroupLabel","priorities":[],"textColor":"#FFFFFF"},{"id":67,"title":"Sinesync","color":"#4c44e8","project_id":null,"created_at":"2020-01-09T12:08:57.685Z","updated_at":"2020-01-09T12:08:57.685Z","template":false,"description":null,"group_id":28,"type":"GroupLabel","priorities":[],"textColor":"#FFFFFF"},{"id":65,"title":"Traphwood","color":"#71b900","project_id":null,"created_at":"2020-01-09T12:08:57.679Z","updated_at":"2020-01-09T12:08:57.679Z","template":false,"description":null,"group_id":28,"type":"GroupLabel","priorities":[],"textColor":"#FFFFFF"},{"id":66,"title":"Tricell","color":"#179ad3","project_id":null,"created_at":"2020-01-09T12:08:57.683Z","updated_at":"2020-01-09T12:08:57.683Z","template":false,"description":null,"group_id":28,"type":"GroupLabel","priorities":[],"textColor":"#FFFFFF"},{"id":63,"title":"Trienceforge","color":"#cb1e0e","project_id":null,"created_at":"2020-01-09T12:08:57.674Z","updated_at":"2020-01-09T12:08:57.674Z","template":false,"description":null,"group_id":28,"type":"GroupLabel","priorities":[],"textColor":"#FFFFFF"},{"id":64,"title":"Trinix","color":"#66ca41","project_id":null,"created_at":"2020-01-09T12:08:57.677Z","updated_at":"2020-01-09T12:08:57.677Z","template":false,"description":null,"group_id":28,"type":"GroupLabel","priorities":[],"textColor":"#FFFFFF"}],"boards":[],"members":[{"id":8,"access_level":10,"source_id":28,"source_type":"Namespace","user_id":13,"notification_level":3,"created_at":"2020-01-09T12:08:57.884Z","updated_at":"2020-01-09T12:08:57.884Z","created_by_id":null,"invite_email":null,"invite_token":null,"invite_accepted_at":null,"requested_at":null,"expires_at":null,"ldap":false,"override":false,"user":{"id":13,"email":"lorraine@leannon.info","username":"elina.lakin"}},{"id":7,"access_level":30,"source_id":28,"source_type":"Namespace","user_id":1,"notification_level":3,"created_at":"2020-01-09T12:08:57.129Z","updated_at":"2020-01-09T12:08:57.898Z","created_by_id":null,"invite_email":null,"invite_token":null,"invite_accepted_at":null,"requested_at":null,"expires_at":null,"ldap":false,"override":false,"user":{"id":1,"email":"admin@example.com","username":"root"}},{"id":9,"access_level":20,"source_id":28,"source_type":"Namespace","user_id":8,"notification_level":3,"created_at":"2020-01-09T12:08:57.901Z","updated_at":"2020-01-09T12:08:57.901Z","created_by_id":null,"invite_email":null,"invite_token":null,"invite_accepted_at":null,"requested_at":null,"expires_at":null,"ldap":false,"override":false,"user":{"id":8,"email":"euna_schroeder@bernier.us","username":"loreen_medhurst"}},{"id":10,"access_level":40,"source_id":28,"source_type":"Namespace","user_id":10,"notification_level":3,"created_at":"2020-01-09T12:08:57.918Z","updated_at":"2020-01-09T12:08:57.918Z","created_by_id":null,"invite_email":null,"invite_token":null,"invite_accepted_at":null,"requested_at":null,"expires_at":null,"ldap":false,"override":false,"user":{"id":10,"email":"glady_green@prohaska.biz","username":"maia_kuhlman"}}],"epics":[{"id":31,"group_id":28,"author_id":13,"assignee_id":null,"iid":1,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2020-01-09T12:11:12.006Z","updated_at":"2020-01-09T12:11:12.006Z","title":"Optio nihil consequatur et vel quaerat cupiditate.","description":"Vel molestias repellendus id voluptatem et non. Blanditiis natus veritatis adipisci qui illo. Sed est veritatis facilis dolore voluptas quibusdam aliquam omnis.\n\nFacere delectus quo architecto explicabo dolores. Quis odit nostrum nobis consequuntur cumque est officiis. Maiores ipsa nobis minus incidunt provident.\n\nVoluptate voluptatem debitis facilis architecto commodi vero. Sit quibusdam consectetur ad quis cupiditate. Exercitationem quasi inventore incidunt itaque optio autem accusantium.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"notes":[]},{"id":32,"group_id":28,"author_id":1,"assignee_id":null,"iid":2,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2020-01-09T12:11:12.021Z","updated_at":"2020-01-09T12:11:12.021Z","title":"Maxime cumque totam deleniti excepturi iusto qui sint.","description":"Nesciunt ut sit voluptas iusto rem. Sint doloribus ex et aliquam ea. Nihil necessitatibus distinctio similique incidunt. Consequatur voluptatibus excepturi qui quis quia. Quia optio quod non magnam dolorem id molestiae dignissimos.\n\nAt eligendi fuga veritatis accusamus quo dolores. Eos amet dolores nisi illo voluptatem consequuntur alias. Dolor veniam quas est sed. Ex corporis soluta sit ducimus facere et.\n\nEst odit asperiores vel quae quibusdam maiores quod. Debitis libero quo sed sunt voluptas praesentium. Ut nisi qui et culpa. Consequatur atque aut molestiae sint. Quaerat expedita animi distinctio repellat sed.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"notes":[]},{"id":33,"group_id":28,"author_id":8,"assignee_id":null,"iid":3,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2020-01-09T12:11:12.035Z","updated_at":"2020-01-09T12:11:12.035Z","title":"Corrupti perferendis labore omnis pariatur dolores aut repellendus quisquam id.","description":"Eligendi est asperiores minus nulla unde ex. Aspernatur repellat vel deleniti molestiae occaecati odio dicta. Ipsam excepturi quia modi ut autem sed. Omnis quae quam quas ut. Et corrupti aut omnis blanditiis.\n\nDolore dolorem accusamus tempore nihil dolores repellendus sed provident. Commodi consectetur blanditiis et consequatur laborum nulla eveniet facilis. Inventore aut officiis fuga est maiores rerum. Sint aspernatur et necessitatibus omnis qui et blanditiis.\n\nFugiat molestias nulla eos labore rerum perspiciatis non. Minus est et ipsum quis animi et. Id praesentium vitae in eum fugiat incidunt. Voluptas ut nemo ut cum saepe quasi dolores unde.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"notes":[]},{"id":34,"group_id":28,"author_id":10,"assignee_id":null,"iid":4,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2020-01-09T12:11:12.049Z","updated_at":"2020-01-09T12:11:12.049Z","title":"Architecto ipsa autem ducimus velit harum doloribus odio fugiat.","description":"Eos perferendis commodi labore id. Ipsa esse non voluptatem sit. Odit et et maiores quis adipisci sed earum.\n\nRerum asperiores consequuntur sed odit. Quis architecto nobis dolor sit consectetur. Inventore praesentium est magnam et reprehenderit impedit occaecati similique.\n\nTemporibus culpa ratione vel facilis perspiciatis rerum. Quisquam ut veniam quia sit totam. Quo ipsam quam dolorum quis. Totam porro nesciunt ut temporibus.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"notes":[]},{"id":35,"group_id":28,"author_id":10,"assignee_id":null,"iid":5,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2020-01-09T12:11:12.062Z","updated_at":"2020-01-09T12:11:12.062Z","title":"Accusantium illo a sint nobis qui explicabo eum iusto facere aut.","description":"Modi laudantium possimus beatae dolorem molestias ut neque. Voluptatem libero harum id cupiditate. Officia et enim quia dolores at adipisci.\n\nEx officia quia at et vel aut. Esse consequatur officiis magnam vel velit eius. Sit cumque quo qui laborum tempore rerum in.\n\nQuibusdam provident quis molestiae laborum odio commodi. Impedit iure voluptatem possimus necessitatibus et error non. Iure est et ipsa recusandae et.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"notes":[]}]}
diff --git a/spec/fixtures/group_export.tar.gz b/spec/fixtures/group_export.tar.gz
index d76c6ddba25..5f5fd989f75 100644
--- a/spec/fixtures/group_export.tar.gz
+++ b/spec/fixtures/group_export.tar.gz
diff --git a/spec/fixtures/group_export_invalid_subrelations.tar.gz b/spec/fixtures/group_export_invalid_subrelations.tar.gz
index 6a8f1453517..6844d166260 100644
--- a/spec/fixtures/group_export_invalid_subrelations.tar.gz
+++ b/spec/fixtures/group_export_invalid_subrelations.tar.gz
diff --git a/spec/fixtures/lib/gitlab/import_export/group_exports/complex/group.json b/spec/fixtures/lib/gitlab/import_export/group_exports/complex/group.json
index 001bf7b43c1..a5a85dc661f 100644
--- a/spec/fixtures/lib/gitlab/import_export/group_exports/complex/group.json
+++ b/spec/fixtures/lib/gitlab/import_export/group_exports/complex/group.json
@@ -19,18 +19,15 @@
   "ldap_sync_last_sync_at": null,
   "lfs_enabled": null,
   "parent_id": 7,
-  "shared_runners_minutes_limit": null,
   "repository_size_limit": null,
   "require_two_factor_authentication": false,
   "two_factor_grace_period": 48,
   "plan_id": null,
   "project_creation_level": 2,
-  "trial_ends_on": null,
   "file_template_project_id": null,
   "saml_discovery_token": "rBKx3ioz",
   "custom_project_templates_group_id": null,
   "auto_devops_enabled": null,
-  "extra_shared_runners_minutes_limit": null,
   "last_ci_minutes_notification_at": null,
   "last_ci_minutes_usage_notification_level": null,
   "runners_token": "token",
@@ -1075,18 +1072,15 @@
       "ldap_sync_last_sync_at": null,
       "lfs_enabled": null,
       "parent_id": 4351,
-      "shared_runners_minutes_limit": null,
       "repository_size_limit": null,
       "require_two_factor_authentication": false,
       "two_factor_grace_period": 48,
       "plan_id": null,
       "project_creation_level": 2,
-      "trial_ends_on": null,
       "file_template_project_id": null,
       "saml_discovery_token": "ki3Xnjw3",
       "custom_project_templates_group_id": null,
       "auto_devops_enabled": null,
-      "extra_shared_runners_minutes_limit": null,
       "last_ci_minutes_notification_at": null,
       "last_ci_minutes_usage_notification_level": null,
       "subgroup_creation_level": 1,
@@ -1649,18 +1643,15 @@
       "ldap_sync_last_sync_at": null,
       "lfs_enabled": null,
       "parent_id": 4351,
-      "shared_runners_minutes_limit": null,
       "repository_size_limit": null,
       "require_two_factor_authentication": false,
       "two_factor_grace_period": 48,
       "plan_id": null,
       "project_creation_level": 2,
-      "trial_ends_on": null,
       "file_template_project_id": null,
       "saml_discovery_token": "m7cx4AZi",
       "custom_project_templates_group_id": null,
       "auto_devops_enabled": null,
-      "extra_shared_runners_minutes_limit": null,
       "last_ci_minutes_notification_at": null,
       "last_ci_minutes_usage_notification_level": null,
       "subgroup_creation_level": 1,
diff --git a/spec/fixtures/lib/gitlab/import_export/group_exports/no_children/group.json b/spec/fixtures/lib/gitlab/import_export/group_exports/no_children/group.json
index 3ffa899405e..158cd22ed2f 100644
--- a/spec/fixtures/lib/gitlab/import_export/group_exports/no_children/group.json
+++ b/spec/fixtures/lib/gitlab/import_export/group_exports/no_children/group.json
@@ -19,18 +19,15 @@
   "ldap_sync_last_sync_at": null,
   "lfs_enabled": null,
   "parent_id": null,
-  "shared_runners_minutes_limit": null,
   "repository_size_limit": null,
   "require_two_factor_authentication": false,
   "two_factor_grace_period": 48,
   "plan_id": null,
   "project_creation_level": 2,
-  "trial_ends_on": null,
   "file_template_project_id": null,
   "saml_discovery_token": "rBKx3ioz",
   "custom_project_templates_group_id": null,
   "auto_devops_enabled": null,
-  "extra_shared_runners_minutes_limit": null,
   "last_ci_minutes_notification_at": null,
   "last_ci_minutes_usage_notification_level": null,
   "subgroup_creation_level": 1,
diff --git a/spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/internal/group.json b/spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/internal/group.json
index f747088f87e..01dc44a28d5 100644
--- a/spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/internal/group.json
+++ b/spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/internal/group.json
@@ -20,17 +20,14 @@
   "ldap_sync_last_sync_at": null,
   "lfs_enabled": null,
   "parent_id": null,
-  "shared_runners_minutes_limit": null,
   "repository_size_limit": null,
   "require_two_factor_authentication": false,
   "two_factor_grace_period": 48,
   "plan_id": null,
   "project_creation_level": 2,
-  "trial_ends_on": null,
   "file_template_project_id": null,
   "custom_project_templates_group_id": null,
   "auto_devops_enabled": null,
-  "extra_shared_runners_minutes_limit": null,
   "last_ci_minutes_notification_at": null,
   "last_ci_minutes_usage_notification_level": null,
   "subgroup_creation_level": 1,
@@ -61,17 +58,14 @@
       "ldap_sync_last_sync_at": null,
       "lfs_enabled": null,
       "parent_id": 283,
-      "shared_runners_minutes_limit": null,
       "repository_size_limit": null,
       "require_two_factor_authentication": false,
       "two_factor_grace_period": 48,
       "plan_id": null,
       "project_creation_level": 2,
-      "trial_ends_on": null,
       "file_template_project_id": null,
       "custom_project_templates_group_id": null,
       "auto_devops_enabled": null,
-      "extra_shared_runners_minutes_limit": null,
       "last_ci_minutes_notification_at": null,
       "last_ci_minutes_usage_notification_level": null,
       "subgroup_creation_level": 1,
@@ -102,17 +96,14 @@
       "ldap_sync_last_sync_at": null,
       "lfs_enabled": null,
       "parent_id": 283,
-      "shared_runners_minutes_limit": null,
       "repository_size_limit": null,
       "require_two_factor_authentication": false,
       "two_factor_grace_period": 48,
       "plan_id": null,
       "project_creation_level": 2,
-      "trial_ends_on": null,
       "file_template_project_id": null,
       "custom_project_templates_group_id": null,
       "auto_devops_enabled": null,
-      "extra_shared_runners_minutes_limit": null,
       "last_ci_minutes_notification_at": null,
       "last_ci_minutes_usage_notification_level": null,
       "subgroup_creation_level": 1,
@@ -143,17 +134,14 @@
       "ldap_sync_last_sync_at": null,
       "lfs_enabled": null,
       "parent_id": 283,
-      "shared_runners_minutes_limit": null,
       "repository_size_limit": null,
       "require_two_factor_authentication": false,
       "two_factor_grace_period": 48,
       "plan_id": null,
       "project_creation_level": 2,
-      "trial_ends_on": null,
       "file_template_project_id": null,
       "custom_project_templates_group_id": null,
       "auto_devops_enabled": null,
-      "extra_shared_runners_minutes_limit": null,
       "last_ci_minutes_notification_at": null,
       "last_ci_minutes_usage_notification_level": null,
       "subgroup_creation_level": 1,
diff --git a/spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/private/group.json b/spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/private/group.json
index 1328e596fa5..c9323f27770 100644
--- a/spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/private/group.json
+++ b/spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/private/group.json
@@ -20,17 +20,14 @@
   "ldap_sync_last_sync_at": null,
   "lfs_enabled": null,
   "parent_id": null,
-  "shared_runners_minutes_limit": null,
   "repository_size_limit": null,
   "require_two_factor_authentication": false,
   "two_factor_grace_period": 48,
   "plan_id": null,
   "project_creation_level": 2,
-  "trial_ends_on": null,
   "file_template_project_id": null,
   "custom_project_templates_group_id": null,
   "auto_devops_enabled": null,
-  "extra_shared_runners_minutes_limit": null,
   "last_ci_minutes_notification_at": null,
   "last_ci_minutes_usage_notification_level": null,
   "subgroup_creation_level": 1,
@@ -61,17 +58,14 @@
       "ldap_sync_last_sync_at": null,
       "lfs_enabled": null,
       "parent_id": 283,
-      "shared_runners_minutes_limit": null,
       "repository_size_limit": null,
       "require_two_factor_authentication": false,
       "two_factor_grace_period": 48,
       "plan_id": null,
       "project_creation_level": 2,
-      "trial_ends_on": null,
       "file_template_project_id": null,
       "custom_project_templates_group_id": null,
       "auto_devops_enabled": null,
-      "extra_shared_runners_minutes_limit": null,
       "last_ci_minutes_notification_at": null,
       "last_ci_minutes_usage_notification_level": null,
       "subgroup_creation_level": 1,
@@ -102,17 +96,14 @@
       "ldap_sync_last_sync_at": null,
       "lfs_enabled": null,
       "parent_id": 283,
-      "shared_runners_minutes_limit": null,
       "repository_size_limit": null,
       "require_two_factor_authentication": false,
       "two_factor_grace_period": 48,
       "plan_id": null,
       "project_creation_level": 2,
-      "trial_ends_on": null,
       "file_template_project_id": null,
       "custom_project_templates_group_id": null,
       "auto_devops_enabled": null,
-      "extra_shared_runners_minutes_limit": null,
       "last_ci_minutes_notification_at": null,
       "last_ci_minutes_usage_notification_level": null,
       "subgroup_creation_level": 1,
@@ -143,17 +134,14 @@
       "ldap_sync_last_sync_at": null,
       "lfs_enabled": null,
       "parent_id": 283,
-      "shared_runners_minutes_limit": null,
       "repository_size_limit": null,
       "require_two_factor_authentication": false,
       "two_factor_grace_period": 48,
       "plan_id": null,
       "project_creation_level": 2,
-      "trial_ends_on": null,
       "file_template_project_id": null,
       "custom_project_templates_group_id": null,
       "auto_devops_enabled": null,
-      "extra_shared_runners_minutes_limit": null,
       "last_ci_minutes_notification_at": null,
       "last_ci_minutes_usage_notification_level": null,
       "subgroup_creation_level": 1,
diff --git a/spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/public/group.json b/spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/public/group.json
index 29020e92004..b4f746b28e2 100644
--- a/spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/public/group.json
+++ b/spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/public/group.json
@@ -20,17 +20,14 @@
   "ldap_sync_last_sync_at": null,
   "lfs_enabled": null,
   "parent_id": null,
-  "shared_runners_minutes_limit": null,
   "repository_size_limit": null,
   "require_two_factor_authentication": false,
   "two_factor_grace_period": 48,
   "plan_id": null,
   "project_creation_level": 2,
-  "trial_ends_on": null,
   "file_template_project_id": null,
   "custom_project_templates_group_id": null,
   "auto_devops_enabled": null,
-  "extra_shared_runners_minutes_limit": null,
   "last_ci_minutes_notification_at": null,
   "last_ci_minutes_usage_notification_level": null,
   "subgroup_creation_level": 1,
@@ -61,17 +58,14 @@
       "ldap_sync_last_sync_at": null,
       "lfs_enabled": null,
       "parent_id": 283,
-      "shared_runners_minutes_limit": null,
       "repository_size_limit": null,
       "require_two_factor_authentication": false,
       "two_factor_grace_period": 48,
       "plan_id": null,
       "project_creation_level": 2,
-      "trial_ends_on": null,
       "file_template_project_id": null,
       "custom_project_templates_group_id": null,
       "auto_devops_enabled": null,
-      "extra_shared_runners_minutes_limit": null,
       "last_ci_minutes_notification_at": null,
       "last_ci_minutes_usage_notification_level": null,
       "subgroup_creation_level": 1,
@@ -102,17 +96,14 @@
       "ldap_sync_last_sync_at": null,
       "lfs_enabled": null,
       "parent_id": 283,
-      "shared_runners_minutes_limit": null,
       "repository_size_limit": null,
       "require_two_factor_authentication": false,
       "two_factor_grace_period": 48,
       "plan_id": null,
       "project_creation_level": 2,
-      "trial_ends_on": null,
       "file_template_project_id": null,
       "custom_project_templates_group_id": null,
       "auto_devops_enabled": null,
-      "extra_shared_runners_minutes_limit": null,
       "last_ci_minutes_notification_at": null,
       "last_ci_minutes_usage_notification_level": null,
       "subgroup_creation_level": 1,
@@ -143,17 +134,14 @@
       "ldap_sync_last_sync_at": null,
       "lfs_enabled": null,
       "parent_id": 283,
-      "shared_runners_minutes_limit": null,
       "repository_size_limit": null,
       "require_two_factor_authentication": false,
       "two_factor_grace_period": 48,
       "plan_id": null,
       "project_creation_level": 2,
-      "trial_ends_on": null,
       "file_template_project_id": null,
       "custom_project_templates_group_id": null,
       "auto_devops_enabled": null,
-      "extra_shared_runners_minutes_limit": null,
       "last_ci_minutes_notification_at": null,
       "last_ci_minutes_usage_notification_level": null,
       "subgroup_creation_level": 1,
diff --git a/spec/graphql/resolvers/metrics/dashboard_resolver_spec.rb b/spec/graphql/resolvers/metrics/dashboard_resolver_spec.rb
new file mode 100644
index 00000000000..6a8eb8a65af
--- /dev/null
+++ b/spec/graphql/resolvers/metrics/dashboard_resolver_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Resolvers::Metrics::DashboardResolver do
+  include GraphqlHelpers
+
+  let_it_be(:current_user) { create(:user) }
+
+  describe '#resolve' do
+    subject(:resolve_dashboard) { resolve(described_class, obj: parent_object, args: args, ctx: { current_user: current_user }) }
+
+    let(:args) do
+      {
+        path: 'config/prometheus/common_metrics.yml'
+      }
+    end
+
+    context 'for environment' do
+      let(:project) { create(:project) }
+      let(:parent_object) { create(:environment, project: project) }
+
+      before do
+        project.add_developer(current_user)
+      end
+
+      it 'use ActiveModel class to find matching dashboard', :aggregate_failures do
+        expected_arguments = { project: project, user: current_user, path: args[:path], options: { environment: parent_object } }
+
+        expect(PerformanceMonitoring::PrometheusDashboard).to receive(:find_for).with(expected_arguments).and_return(PerformanceMonitoring::PrometheusDashboard.new)
+        expect(resolve_dashboard).to be_instance_of PerformanceMonitoring::PrometheusDashboard
+      end
+
+      context 'without parent object' do
+        let(:parent_object) { nil }
+
+        it 'returns nil', :aggregate_failures do
+          expect(PerformanceMonitoring::PrometheusDashboard).not_to receive(:find_for)
+          expect(resolve_dashboard).to be_nil
+        end
+      end
+    end
+  end
+end
diff --git a/spec/graphql/types/environment_type_spec.rb b/spec/graphql/types/environment_type_spec.rb
index b3711fa2f5c..24a8bddfa6a 100644
--- a/spec/graphql/types/environment_type_spec.rb
+++ b/spec/graphql/types/environment_type_spec.rb
@@ -7,7 +7,7 @@ describe GitlabSchema.types['Environment'] do
 
   it 'has the expected fields' do
     expected_fields = %w[
-      name id state
+      name id state metrics_dashboard
     ]
 
     expect(described_class).to have_graphql_fields(*expected_fields)
diff --git a/spec/graphql/types/metrics/dashboard_type_spec.rb b/spec/graphql/types/metrics/dashboard_type_spec.rb
new file mode 100644
index 00000000000..4795fd77537
--- /dev/null
+++ b/spec/graphql/types/metrics/dashboard_type_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSchema.types['MetricsDashboard'] do
+  it { expect(described_class.graphql_name).to eq('MetricsDashboard') }
+
+  it 'has the expected fields' do
+    expected_fields = %w[
+      path
+    ]
+
+    expect(described_class).to have_graphql_fields(*expected_fields)
+  end
+end
diff --git a/spec/lib/gitlab/alerting/alert_spec.rb b/spec/lib/gitlab/alerting/alert_spec.rb
index 8b67cf949ce..6d97f08af91 100644
--- a/spec/lib/gitlab/alerting/alert_spec.rb
+++ b/spec/lib/gitlab/alerting/alert_spec.rb
@@ -9,11 +9,14 @@ describe Gitlab::Alerting::Alert do
   let(:payload) { {} }
 
   shared_context 'gitlab alert' do
-    let(:gitlab_alert_id) { gitlab_alert.prometheus_metric_id.to_s }
     let!(:gitlab_alert) { create(:prometheus_alert, project: project) }
+    let(:gitlab_alert_id) { gitlab_alert.id }
 
     before do
-      payload['labels'] = { 'gitlab_alert_id' => gitlab_alert_id }
+      payload['labels'] = {
+        'gitlab_alert_id' => gitlab_alert.prometheus_metric_id.to_s,
+        'gitlab_prometheus_alert_id' => gitlab_alert_id
+      }
     end
   end
 
@@ -68,6 +71,41 @@ describe Gitlab::Alerting::Alert do
 
       it { is_expected.to be_nil }
     end
+
+    context 'when two alerts with the same metric exist' do
+      include_context 'gitlab alert'
+
+      let!(:second_gitlab_alert) do
+        create(:prometheus_alert,
+          project: project,
+          prometheus_metric_id: gitlab_alert.prometheus_metric_id
+        )
+      end
+
+      context 'alert id given in params' do
+        before do
+          payload['labels'] = {
+            'gitlab_alert_id' => gitlab_alert.prometheus_metric_id.to_s,
+            'gitlab_prometheus_alert_id' => second_gitlab_alert.id
+          }
+        end
+
+        it { is_expected.to eq(second_gitlab_alert) }
+      end
+
+      context 'metric id given in params' do
+        # This tests the case when two alerts are found, as metric id
+        # is not unique.
+
+        # Note the metric id was incorrectly named as 'gitlab_alert_id'
+        # in PrometheusAlert#to_param.
+        before do
+          payload['labels'] = { 'gitlab_alert_id' => gitlab_alert.prometheus_metric_id }
+        end
+
+        it { is_expected.to be_nil }
+      end
+    end
   end
 
   describe '#title' do
diff --git a/spec/models/prometheus_alert_spec.rb b/spec/models/prometheus_alert_spec.rb
index cdcdb46a6c4..1409cf65fee 100644
--- a/spec/models/prometheus_alert_spec.rb
+++ b/spec/models/prometheus_alert_spec.rb
@@ -96,7 +96,8 @@ describe PrometheusAlert do
         "for" => "5m",
         "labels" => {
           "gitlab" => "hook",
-          "gitlab_alert_id" => metric.id
+          "gitlab_alert_id" => metric.id,
+          "gitlab_prometheus_alert_id" => subject.id
         })
     end
   end
diff --git a/spec/requests/api/graphql/metrics/dashboard_query_spec.rb b/spec/requests/api/graphql/metrics/dashboard_query_spec.rb
new file mode 100644
index 00000000000..8b0965a815b
--- /dev/null
+++ b/spec/requests/api/graphql/metrics/dashboard_query_spec.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Getting Metrics Dashboard' do
+  include GraphqlHelpers
+
+  let_it_be(:current_user) { create(:user) }
+  let(:project) { create(:project) }
+  let!(:environment) { create(:environment, project: project) }
+
+  let(:fields) do
+    <<~QUERY
+      #{all_graphql_fields_for('MetricsDashboard'.classify)}
+    QUERY
+  end
+
+  let(:query) do
+    %(
+      query {
+        project(fullPath:"#{project.full_path}") {
+          environments(name: "#{environment.name}") {
+            nodes {
+              metricsDashboard(path: "#{path}"){
+                #{fields}
+              }
+            }
+          }
+        }
+      }
+    )
+  end
+
+  context 'for anonymous user' do
+    before do
+      post_graphql(query, current_user: current_user)
+    end
+
+    context 'requested dashboard is available' do
+      let(:path) { 'config/prometheus/common_metrics.yml' }
+
+      it_behaves_like 'a working graphql query'
+
+      it 'returns nil' do
+        dashboard = graphql_data.dig('project', 'environments', 'nodes')
+
+        expect(dashboard).to be_nil
+      end
+    end
+  end
+
+  context 'for user with developer access' do
+    before do
+      project.add_developer(current_user)
+      post_graphql(query, current_user: current_user)
+    end
+
+    context 'requested dashboard is available' do
+      let(:path) { 'config/prometheus/common_metrics.yml' }
+
+      it_behaves_like 'a working graphql query'
+
+      it 'returns metrics dashboard' do
+        dashboard = graphql_data.dig('project', 'environments', 'nodes')[0]['metricsDashboard']
+
+        expect(dashboard).to eql("path" => path)
+      end
+    end
+
+    context 'requested dashboard can not be found' do
+      let(:path) { 'config/prometheus/i_am_not_here.yml' }
+
+      it_behaves_like 'a working graphql query'
+
+      it 'return snil' do
+        dashboard = graphql_data.dig('project', 'environments', 'nodes')[0]['metricsDashboard']
+
+        expect(dashboard).to be_nil
+      end
+    end
+  end
+end