diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /spec/fixtures/lib | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'spec/fixtures/lib')
7 files changed, 112 insertions, 2 deletions
diff --git a/spec/fixtures/lib/gitlab/import_export/designs/project.json b/spec/fixtures/lib/gitlab/import_export/designs/project.json index e11b10a1d4c..1d51a726c4c 100644 --- a/spec/fixtures/lib/gitlab/import_export/designs/project.json +++ b/spec/fixtures/lib/gitlab/import_export/designs/project.json @@ -61,7 +61,7 @@ "lock_version":0, "time_estimate":0, "relative_position":1073742323, - "service_desk_reply_to":null, + "external_author":null, "last_edited_at":null, "last_edited_by_id":null, "discussion_locked":null, @@ -244,7 +244,7 @@ "lock_version":0, "time_estimate":0, "relative_position":1073742823, - "service_desk_reply_to":null, + "external_author":null, "last_edited_at":null, "last_edited_by_id":null, "discussion_locked":null, diff --git a/spec/fixtures/lib/gitlab/import_export/group_exports/child_short_name/tree/groups/4351.json b/spec/fixtures/lib/gitlab/import_export/group_exports/child_short_name/tree/groups/4351.json new file mode 100644 index 00000000000..ce657ded7b0 --- /dev/null +++ b/spec/fixtures/lib/gitlab/import_export/group_exports/child_short_name/tree/groups/4351.json @@ -0,0 +1 @@ +{"name":"ymg09t5704clnxnqfgaj2h098gz4r7gyx4wc3fzmlqj1en24zf","path":"ymg09t5704clnxnqfgaj2h098gz4r7gyx4wc3fzmlqj1en24zf","owner_id":123,"created_at":"2019-11-20 17:01:53 UTC","updated_at":"2019-11-20 17:05:44 UTC","description":"Group Description","avatar":{"url":null},"membership_lock":false,"share_with_group_lock":false,"visibility_level":0,"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,"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","runners_token_encrypted":"encrypted","subgroup_creation_level":1,"emails_disabled":null,"max_pages_size":null,"max_artifacts_size":null,"id":4351}
\ No newline at end of file diff --git a/spec/fixtures/lib/gitlab/import_export/group_exports/child_short_name/tree/groups/4352.json b/spec/fixtures/lib/gitlab/import_export/group_exports/child_short_name/tree/groups/4352.json new file mode 100644 index 00000000000..d57f23f0222 --- /dev/null +++ b/spec/fixtures/lib/gitlab/import_export/group_exports/child_short_name/tree/groups/4352.json @@ -0,0 +1 @@ +{"name":"a","path":"a","owner_id":null,"created_at":"2019-11-20 17:01:53 UTC","updated_at":"2019-11-20 17:05:44 UTC","description":"","avatar":{"url":null},"membership_lock":false,"share_with_group_lock":false,"visibility_level":0,"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":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,"emails_disabled":null,"max_pages_size":null,"max_artifacts_size":null,"id":4352} diff --git a/spec/fixtures/lib/gitlab/import_export/group_exports/child_short_name/tree/groups/_all.ndjson b/spec/fixtures/lib/gitlab/import_export/group_exports/child_short_name/tree/groups/_all.ndjson new file mode 100644 index 00000000000..078909d30fb --- /dev/null +++ b/spec/fixtures/lib/gitlab/import_export/group_exports/child_short_name/tree/groups/_all.ndjson @@ -0,0 +1,2 @@ +4351 +4352 diff --git a/spec/fixtures/lib/gitlab/import_export/project_with_invalid_relations/tree/project.json b/spec/fixtures/lib/gitlab/import_export/project_with_invalid_relations/tree/project.json new file mode 100644 index 00000000000..12136c6df3b --- /dev/null +++ b/spec/fixtures/lib/gitlab/import_export/project_with_invalid_relations/tree/project.json @@ -0,0 +1 @@ +{"description":"Nisi et repellendus ut enim quo accusamus vel magnam.","import_type":"gitlab_project","creator_id":2147483547,"visibility_level":10,"archived":false,"hooks":[]} diff --git a/spec/fixtures/lib/gitlab/import_export/project_with_invalid_relations/tree/project/labels.ndjson b/spec/fixtures/lib/gitlab/import_export/project_with_invalid_relations/tree/project/labels.ndjson new file mode 100644 index 00000000000..34a2f48ac87 --- /dev/null +++ b/spec/fixtures/lib/gitlab/import_export/project_with_invalid_relations/tree/project/labels.ndjson @@ -0,0 +1 @@ +{"id":2,"title":"","color":"#428bca","project_id":8,"created_at":"2016-07-22T08:55:44.161Z","updated_at":"2016-07-22T08:55:44.161Z","template":false,"description":"","type":"","priorities":[]} diff --git a/spec/fixtures/lib/gitlab/performance_bar/peek_data.json b/spec/fixtures/lib/gitlab/performance_bar/peek_data.json new file mode 100644 index 00000000000..8e207b69ecb --- /dev/null +++ b/spec/fixtures/lib/gitlab/performance_bar/peek_data.json @@ -0,0 +1,104 @@ +{ + "context": {}, + "data": { + "host": { + "hostname": "pc", + "canary": null + }, + "active-record": { + "duration": "6ms", + "calls": "7 (0 cached)", + "details": [ + { + "duration": 1.096, + "sql": "SELECT COUNT(*) FROM ((SELECT \"badges\".* FROM \"badges\" WHERE \"badges\".\"type\" = 'ProjectBadge' AND \"badges\".\"project_id\" = 8)\nUNION\n(SELECT \"badges\".* FROM \"badges\" WHERE \"badges\".\"type\" = 'GroupBadge' AND \"badges\".\"group_id\" IN (SELECT \"namespaces\".\"id\" FROM \"namespaces\" WHERE \"namespaces\".\"type\" = 'Group' AND \"namespaces\".\"id\" = 28))) badges", + "backtrace": [ + "lib/gitlab/pagination/offset_pagination.rb:53:in `add_pagination_headers'", + "lib/gitlab/pagination/offset_pagination.rb:15:in `block in paginate'", + "lib/gitlab/pagination/offset_pagination.rb:14:in `tap'", + "lib/gitlab/pagination/offset_pagination.rb:14:in `paginate'", + "lib/api/helpers/pagination.rb:7:in `paginate'", + "lib/api/badges.rb:42:in `block (3 levels) in <class:Badges>'", + "ee/lib/gitlab/ip_address_state.rb:10:in `with'", + "lib/api/api_guard.rb:208:in `call'", + "lib/gitlab/jira/middleware.rb:19:in `call'" + ], + "cached": "", + "warnings": [] + }, + { + "duration": 0.817, + "sql": "SELECT \"projects\".* FROM \"projects\" WHERE \"projects\".\"pending_delete\" = $1 AND \"projects\".\"id\" = $2 LIMIT $3", + "backtrace": [ + "lib/api/helpers.rb:112:in `find_project'", + "ee/lib/ee/api/helpers.rb:88:in `find_project!'", + "lib/api/helpers/members_helpers.rb:14:in `public_send'", + "lib/api/helpers/members_helpers.rb:14:in `find_source'", + "lib/api/badges.rb:36:in `block (3 levels) in <class:Badges>'", + "ee/lib/gitlab/ip_address_state.rb:10:in `with'", + "lib/api/api_guard.rb:208:in `call'", + "lib/gitlab/jira/middleware.rb:19:in `call'" + ], + "cached": "", + "warnings": [] + }, + { + "duration": 0.817, + "sql": "SELECT \"projects\".* FROM \"projects\" WHERE \"projects\".\"pending_delete\" = $1 AND \"projects\".\"id\" = $2 LIMIT $3", + "backtrace": [ + "lib/api/helpers.rb:112:in `find_project'", + "ee/lib/ee/api/helpers.rb:88:in `find_project!'", + "lib/api/helpers/members_helpers.rb:14:in `public_send'", + "lib/api/helpers/members_helpers.rb:14:in `find_source'", + "lib/api/badges.rb:36:in `block (3 levels) in <class:Badges>'", + "ee/lib/gitlab/ip_address_state.rb:10:in `with'", + "lib/api/api_guard.rb:208:in `call'", + "lib/gitlab/jira/middleware.rb:19:in `call'" + ], + "cached": "", + "warnings": [] + } + ], + "warnings": [] + }, + "gitaly": { + "duration": "0ms", + "calls": 0, + "details": [], + "warnings": [] + }, + "redis": { + "duration": "0ms", + "calls": 1, + "details": [ + { + "cmd": "get cache:gitlab:flipper/v1/feature/api_kaminari_count_with_limit", + "duration": 0.155, + "backtrace": [ + "lib/gitlab/instrumentation/redis_interceptor.rb:30:in `call'", + "lib/feature.rb:81:in `enabled?'", + "lib/gitlab/pagination/offset_pagination.rb:30:in `paginate_with_limit_optimization'", + "lib/gitlab/pagination/offset_pagination.rb:14:in `paginate'", + "lib/api/helpers/pagination.rb:7:in `paginate'", + "lib/api/badges.rb:42:in `block (3 levels) in <class:Badges>'", + "ee/lib/gitlab/ip_address_state.rb:10:in `with'", + "lib/api/api_guard.rb:208:in `call'", + "lib/gitlab/jira/middleware.rb:19:in `call'" + ], + "storage": "Cache", + "warnings": [], + "instance": "Cache" + } + ], + "warnings": [] + }, + "es": { + "duration": "0ms", + "calls": 0, + "details": [], + "warnings": [] + } + }, + "has_warnings": false +} + |