diff options
Diffstat (limited to 'spec/fixtures')
20 files changed, 123 insertions, 31 deletions
diff --git a/spec/fixtures/api/schemas/entities/discussion.json b/spec/fixtures/api/schemas/entities/discussion.json index f91571fbc48..625f9b86187 100644 --- a/spec/fixtures/api/schemas/entities/discussion.json +++ b/spec/fixtures/api/schemas/entities/discussion.json @@ -118,6 +118,9 @@ "null" ] }, + "resolved_by_push": { + "type": "boolean" + }, "resolved_at": { "type": [ "string", diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/package_metadata.json b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/package_metadata.json index 9c80f1621ad..c27ea2840a7 100644 --- a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/package_metadata.json +++ b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/package_metadata.json @@ -20,6 +20,7 @@ "dependencyGroups", "id", "packageContent", + "description", "summary", "version" ], @@ -36,6 +37,9 @@ "packageContent": { "type": "string" }, + "description": { + "type": "string" + }, "summary": { "type": "string" }, diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json index 94b5ad48a1e..d17a3176433 100644 --- a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json +++ b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json @@ -49,6 +49,7 @@ "dependencyGroups", "id", "packageContent", + "description", "summary", "version" ], @@ -65,6 +66,9 @@ "packageContent": { "type": "string" }, + "description": { + "type": "string" + }, "summary": { "type": "string" }, diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/search.json b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/search.json index 41ad7379d73..74f2913e5b9 100644 --- a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/search.json +++ b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/search.json @@ -16,6 +16,7 @@ "@type", "authors", "id", + "description", "summary", "title", "totalDownloads", @@ -32,6 +33,9 @@ "id": { "type": "string" }, + "description": { + "type": "string" + }, "summary": { "type": "string" }, diff --git a/spec/fixtures/gl-annotations.json.gz b/spec/fixtures/gl-annotations.json.gz Binary files differnew file mode 100644 index 00000000000..493b51f2243 --- /dev/null +++ b/spec/fixtures/gl-annotations.json.gz diff --git a/spec/fixtures/lib/backup/design_repo.refs b/spec/fixtures/lib/backup/design_repo.refs new file mode 100644 index 00000000000..0df0c6916cb --- /dev/null +++ b/spec/fixtures/lib/backup/design_repo.refs @@ -0,0 +1,2 @@ +c3cd4d7bd73a51a0f22045c3a4c871c435dc959d HEAD +c3cd4d7bd73a51a0f22045c3a4c871c435dc959d refs/heads/master diff --git a/spec/fixtures/lib/backup/personal_snippet_repo.refs b/spec/fixtures/lib/backup/personal_snippet_repo.refs new file mode 100644 index 00000000000..ece8aa8f40f --- /dev/null +++ b/spec/fixtures/lib/backup/personal_snippet_repo.refs @@ -0,0 +1,2 @@ +3b3c067a3bc1d1b695b51e2be30c0f8cf698a06e HEAD +3b3c067a3bc1d1b695b51e2be30c0f8cf698a06e refs/heads/master diff --git a/spec/fixtures/lib/backup/project_repo.refs b/spec/fixtures/lib/backup/project_repo.refs new file mode 100644 index 00000000000..a075e52264c --- /dev/null +++ b/spec/fixtures/lib/backup/project_repo.refs @@ -0,0 +1,2 @@ +393a7d860a5a4c3cc736d7eb00604e3472bb95ec HEAD +393a7d860a5a4c3cc736d7eb00604e3472bb95ec refs/heads/master diff --git a/spec/fixtures/lib/backup/project_snippet_repo.refs b/spec/fixtures/lib/backup/project_snippet_repo.refs new file mode 100644 index 00000000000..5a2c600a876 --- /dev/null +++ b/spec/fixtures/lib/backup/project_snippet_repo.refs @@ -0,0 +1,2 @@ +6e44ba56a4748be361a841e759c20e421a1651a1 HEAD +6e44ba56a4748be361a841e759c20e421a1651a1 refs/heads/master diff --git a/spec/fixtures/lib/backup/wiki_repo.refs b/spec/fixtures/lib/backup/wiki_repo.refs new file mode 100644 index 00000000000..dab2adaf520 --- /dev/null +++ b/spec/fixtures/lib/backup/wiki_repo.refs @@ -0,0 +1,2 @@ +c74b9948d0088d703ee1fafeddd9ed9add2901ea HEAD +c74b9948d0088d703ee1fafeddd9ed9add2901ea refs/heads/master diff --git a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric.yml b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric.yml index 42f9cc31c3a..29dd2ce0e84 100644 --- a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric.yml +++ b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric.yml @@ -11,13 +11,13 @@ milestone: "13.9" introduced_by_url: time_frame: 7d data_source: -data_category: operational +data_category: optional instrumentation_class: Count performance_indicator_type: [] distribution: - ce -# Add here corresponding tiers -# tier: -# - free -# - premium -# - ultimate +- ee +tier: +- free +- premium +- ultimate diff --git a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_ee.yml b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_ee.yml index e123056d771..cf2a10a46d1 100644 --- a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_ee.yml +++ b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_ee.yml @@ -1,6 +1,5 @@ --- key_path: counts_weekly.test_metric -name: test metric name description: product_section: product_stage: diff --git a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_name_suggestions.yml b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_name_suggestions.yml deleted file mode 100644 index 87c4e68f19e..00000000000 --- a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_name_suggestions.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -# See Usage Ping metrics dictionary docs https://docs.gitlab.com/ee/development/usage_ping/metrics_dictionary.html -key_path: counts_weekly.test_metric -name: test metric name -description: -product_section: -product_stage: -product_group: -value_type: number -status: active -milestone: "13.9" -introduced_by_url: -time_frame: 7d -data_source: -data_category: optional -instrumentation_class: Count -performance_indicator_type: [] -distribution: -- ce -- ee -tier: -- free -- premium -- ultimate diff --git a/spec/fixtures/migrations/db/migrate/database_migration.txt b/spec/fixtures/migrations/db/migrate/database_migration.txt new file mode 100644 index 00000000000..594d06f8431 --- /dev/null +++ b/spec/fixtures/migrations/db/migrate/database_migration.txt @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class DatabaseMigration < Gitlab::Database::Migration[2.0] + def up + add_column :dast_site_profiles, :scan_file_path, :text + end + + def down + remove_column :dast_site_profiles, :scan_file_path, :text + end +end diff --git a/spec/fixtures/migrations/db/migrate/database_migration_two.txt b/spec/fixtures/migrations/db/migrate/database_migration_two.txt new file mode 100644 index 00000000000..236529b4b2d --- /dev/null +++ b/spec/fixtures/migrations/db/migrate/database_migration_two.txt @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class Gitlab::Database::DatabaseMigration < Gitlab::Database::Migration[2.0] + def up + add_column :dast_site_profiles, :scan_file_path, :text + end + + def down + remove_column :dast_site_profiles, :scan_file_path, :text + end +end diff --git a/spec/fixtures/migrations/db/post_migrate/database_clash_migration.txt b/spec/fixtures/migrations/db/post_migrate/database_clash_migration.txt new file mode 100644 index 00000000000..a936dafd69f --- /dev/null +++ b/spec/fixtures/migrations/db/post_migrate/database_clash_migration.txt @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class ::ClashMigration < Gitlab::Database::Migration[2.0] + def up + add_column :dast_site_profiles, :scan_file_path, :text + end + + def down + remove_column :dast_site_profiles, :scan_file_path, :text + end +end diff --git a/spec/fixtures/migrations/db/post_migrate/database_clash_migration_two.txt b/spec/fixtures/migrations/db/post_migrate/database_clash_migration_two.txt new file mode 100644 index 00000000000..6af29a498bd --- /dev/null +++ b/spec/fixtures/migrations/db/post_migrate/database_clash_migration_two.txt @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class Gitlab::ClashMigrationTwo < Gitlab::Database::Migration[2.0] + def up + add_column :dast_site_profiles, :scan_file_path, :text + end + + def down + remove_column :dast_site_profiles, :scan_file_path, :text + end +end diff --git a/spec/fixtures/migrations/elasticsearch/elasticsearch_clash_migration.txt b/spec/fixtures/migrations/elasticsearch/elasticsearch_clash_migration.txt new file mode 100644 index 00000000000..e723d9f44e7 --- /dev/null +++ b/spec/fixtures/migrations/elasticsearch/elasticsearch_clash_migration.txt @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class ClashMigration < Elastic::Migration + include Elastic::MigrationCreateIndex + + retry_on_failure + + def document_type + :epic + end + + def target_class + Epic + end +end diff --git a/spec/fixtures/migrations/elasticsearch/elasticsearch_clash_migration_two.txt b/spec/fixtures/migrations/elasticsearch/elasticsearch_clash_migration_two.txt new file mode 100644 index 00000000000..6af29a498bd --- /dev/null +++ b/spec/fixtures/migrations/elasticsearch/elasticsearch_clash_migration_two.txt @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class Gitlab::ClashMigrationTwo < Gitlab::Database::Migration[2.0] + def up + add_column :dast_site_profiles, :scan_file_path, :text + end + + def down + remove_column :dast_site_profiles, :scan_file_path, :text + end +end diff --git a/spec/fixtures/migrations/elasticsearch/elasticsearch_migration.txt b/spec/fixtures/migrations/elasticsearch/elasticsearch_migration.txt new file mode 100644 index 00000000000..122d3ef6d2b --- /dev/null +++ b/spec/fixtures/migrations/elasticsearch/elasticsearch_migration.txt @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +class ElasticsearchMigration < Elastic::Migration + include Elastic::MigrationUpdateMappingsHelper + + private + + def index_name + Project.__elasticsearch__.index_name + end + + def new_mappings + { + readme_content: { + type: 'text' + }, + ci_catalog: { + type: 'boolean' + } + } + end +end |