From ed5add1c2f001c9bd54e664b32f212de172eca6a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 10 Apr 2020 18:09:32 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../gitlab/import_export/group_exports/complex/group.json | 9 --------- .../import_export/group_exports/no_children/group.json | 3 --- .../group_exports/visibility_levels/internal/group.json | 12 ------------ .../group_exports/visibility_levels/private/group.json | 12 ------------ .../group_exports/visibility_levels/public/group.json | 12 ------------ 5 files changed, 48 deletions(-) (limited to 'spec/fixtures/lib') 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, -- cgit v1.2.1