diff options
-rw-r--r-- | GITLAB_PAGES_VERSION | 2 | ||||
-rw-r--r-- | db/docs/deleted_tables/member_tasks.yml (renamed from db/docs/member_tasks.yml) | 2 | ||||
-rw-r--r-- | db/post_migrate/20231013174138_drop_member_tasks_table.rb | 24 | ||||
-rw-r--r-- | db/schema_migrations/20231013174138 | 1 | ||||
-rw-r--r-- | db/structure.sql | 35 | ||||
-rw-r--r-- | doc/ci/components/index.md | 2 | ||||
-rw-r--r-- | doc/ci/secure_files/index.md | 5 | ||||
-rw-r--r-- | doc/ci/troubleshooting.md | 2 | ||||
-rw-r--r-- | qa/qa/factories/tags.rb | 7 | ||||
-rw-r--r-- | qa/qa/specs/features/api/1_manage/integrations/webhook_events_spec.rb | 6 | ||||
-rw-r--r-- | qa/qa/specs/features/browser_ui/5_package/infrastructure_registry/terraform_module_registry_spec.rb | 6 |
11 files changed, 44 insertions, 48 deletions
diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index ff56d3c5926..4a7fd6cd0fd 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -eadd269e8d53425f090fa059a7cd30c266bde8a7 +885055526d498a171120e69d7fe1c769814b73ec diff --git a/db/docs/member_tasks.yml b/db/docs/deleted_tables/member_tasks.yml index 94e0c44e122..b3f6b22b07a 100644 --- a/db/docs/member_tasks.yml +++ b/db/docs/deleted_tables/member_tasks.yml @@ -6,3 +6,5 @@ description: TODO introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69299 milestone: '14.5' gitlab_schema: gitlab_main +removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134169 +removed_in_milestone: '16.5' diff --git a/db/post_migrate/20231013174138_drop_member_tasks_table.rb b/db/post_migrate/20231013174138_drop_member_tasks_table.rb new file mode 100644 index 00000000000..77c03c0017e --- /dev/null +++ b/db/post_migrate/20231013174138_drop_member_tasks_table.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +class DropMemberTasksTable < Gitlab::Database::Migration[2.1] + disable_ddl_transaction! + + INDEX_NAME = 'index_member_tasks_on_member_id_and_project_id' + + def up + drop_table :member_tasks + end + + def down + create_table :member_tasks, id: :bigserial, force: :cascade do |t| + t.bigint :member_id, null: false + t.references :project, type: :bigint, null: false, foreign_key: { on_delete: :cascade } + t.timestamps_with_timezone null: false + t.integer :tasks, array: true, default: '{}', limit: 2, null: false + t.index :member_id, name: 'index_member_tasks_on_member_id' + end + + add_concurrent_foreign_key :member_tasks, :members, column: :member_id, on_delete: :cascade + add_concurrent_index :member_tasks, [:member_id, :project_id], unique: true, name: INDEX_NAME + end +end diff --git a/db/schema_migrations/20231013174138 b/db/schema_migrations/20231013174138 new file mode 100644 index 00000000000..0ce3e8e16d6 --- /dev/null +++ b/db/schema_migrations/20231013174138 @@ -0,0 +1 @@ +3f948fc69b42bc11c67ad9b9eff71e08e397582e79cdf9c6469147ec56017f5f
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index e3fd9839752..2647caff695 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -18160,24 +18160,6 @@ CREATE SEQUENCE member_roles_id_seq ALTER SEQUENCE member_roles_id_seq OWNED BY member_roles.id; -CREATE TABLE member_tasks ( - id bigint NOT NULL, - member_id bigint NOT NULL, - project_id bigint NOT NULL, - created_at timestamp with time zone NOT NULL, - updated_at timestamp with time zone NOT NULL, - tasks smallint[] DEFAULT '{}'::smallint[] NOT NULL -); - -CREATE SEQUENCE member_tasks_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - -ALTER SEQUENCE member_tasks_id_seq OWNED BY member_tasks.id; - CREATE TABLE members ( id integer NOT NULL, access_level integer NOT NULL, @@ -26440,8 +26422,6 @@ ALTER TABLE ONLY loose_foreign_keys_deleted_records ALTER COLUMN id SET DEFAULT ALTER TABLE ONLY member_roles ALTER COLUMN id SET DEFAULT nextval('member_roles_id_seq'::regclass); -ALTER TABLE ONLY member_tasks ALTER COLUMN id SET DEFAULT nextval('member_tasks_id_seq'::regclass); - ALTER TABLE ONLY members ALTER COLUMN id SET DEFAULT nextval('members_id_seq'::regclass); ALTER TABLE ONLY merge_request_assignees ALTER COLUMN id SET DEFAULT nextval('merge_request_assignees_id_seq'::regclass); @@ -28665,9 +28645,6 @@ ALTER TABLE ONLY loose_foreign_keys_deleted_records ALTER TABLE ONLY member_roles ADD CONSTRAINT member_roles_pkey PRIMARY KEY (id); -ALTER TABLE ONLY member_tasks - ADD CONSTRAINT member_tasks_pkey PRIMARY KEY (id); - ALTER TABLE ONLY members ADD CONSTRAINT members_pkey PRIMARY KEY (id); @@ -32897,12 +32874,6 @@ CREATE INDEX index_manifest_states_pending_verification ON dependency_proxy_mani CREATE INDEX index_member_roles_on_namespace_id ON member_roles USING btree (namespace_id); -CREATE INDEX index_member_tasks_on_member_id ON member_tasks USING btree (member_id); - -CREATE UNIQUE INDEX index_member_tasks_on_member_id_and_project_id ON member_tasks USING btree (member_id, project_id); - -CREATE INDEX index_member_tasks_on_project_id ON member_tasks USING btree (project_id); - CREATE INDEX index_members_on_access_level ON members USING btree (access_level); CREATE INDEX index_members_on_expires_at ON members USING btree (expires_at); @@ -36764,9 +36735,6 @@ ALTER TABLE ONLY project_pages_metadata ALTER TABLE ONLY group_deletion_schedules ADD CONSTRAINT fk_11e3ebfcdd FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE; -ALTER TABLE ONLY member_tasks - ADD CONSTRAINT fk_12816d4bbb FOREIGN KEY (member_id) REFERENCES members(id) ON DELETE CASCADE; - ALTER TABLE ONLY vulnerabilities ADD CONSTRAINT fk_1302949740 FOREIGN KEY (last_edited_by_id) REFERENCES users(id) ON DELETE SET NULL; @@ -37403,9 +37371,6 @@ ALTER TABLE ONLY identities ALTER TABLE ONLY boards ADD CONSTRAINT fk_ab0a250ff6 FOREIGN KEY (iteration_cadence_id) REFERENCES iterations_cadences(id) ON DELETE CASCADE; -ALTER TABLE ONLY member_tasks - ADD CONSTRAINT fk_ab636303dd FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE; - ALTER TABLE ONLY merge_requests ADD CONSTRAINT fk_ad525e1f87 FOREIGN KEY (merge_user_id) REFERENCES users(id) ON DELETE SET NULL; diff --git a/doc/ci/components/index.md b/doc/ci/components/index.md index aeee871612f..a3d6d7224e4 100644 --- a/doc/ci/components/index.md +++ b/doc/ci/components/index.md @@ -34,7 +34,7 @@ If a component requires different versioning from other components, the componen To create a components repository, you must: 1. [Create a new project](../../user/project/index.md#create-a-blank-project) with a `README.md` file. -1. Create either a single file or a templates directory according to the [directory structure](#directory-structure). +1. Add a YAML configuration file for each component, following the [required directory structure](#directory-structure). For example: diff --git a/doc/ci/secure_files/index.md b/doc/ci/secure_files/index.md index a666e0aca7b..d2ce98ad048 100644 --- a/doc/ci/secure_files/index.md +++ b/doc/ci/secure_files/index.md @@ -56,3 +56,8 @@ test: script: - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash ``` + +WARNING: +The content of files loaded with the `download-secure-files` tool are not [masked](../variables/index.md#mask-a-cicd-variable) +in the job log output. Make sure to avoid outputting secure file contents in the job log, +especially when logging output that could contain sensitive information. diff --git a/doc/ci/troubleshooting.md b/doc/ci/troubleshooting.md index 24e3e6ad315..cc7e5594466 100644 --- a/doc/ci/troubleshooting.md +++ b/doc/ci/troubleshooting.md @@ -230,7 +230,7 @@ The configuration can be added to: job_name: hooks: pre_get_sources_script: - - git config --local http.version "HTTP/1.1" + - git config --global http.version "HTTP/1.1" ``` - The [runner's `config.toml`](https://docs.gitlab.com/runner/configuration/advanced-configuration.html) diff --git a/qa/qa/factories/tags.rb b/qa/qa/factories/tags.rb new file mode 100644 index 00000000000..19db7ae28c8 --- /dev/null +++ b/qa/qa/factories/tags.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +module QA + FactoryBot.define do + factory :tag, class: 'QA::Resource::Tag' + end +end diff --git a/qa/qa/specs/features/api/1_manage/integrations/webhook_events_spec.rb b/qa/qa/specs/features/api/1_manage/integrations/webhook_events_spec.rb index 0ec8be49160..06990c0c74b 100644 --- a/qa/qa/specs/features/api/1_manage/integrations/webhook_events_spec.rb +++ b/qa/qa/specs/features/api/1_manage/integrations/webhook_events_spec.rb @@ -78,11 +78,7 @@ module QA project_push.project = webhook.project end - Resource::Tag.fabricate_via_api! do |tag| - tag.project = project_push.project - tag.ref = project_push.branch_name - tag.name = tag_name - end + create(:tag, project: project_push.project, ref: project_push.branch_name, name: tag_name) expect_web_hook_single_event_success(webhook, smocker, type: 'tag_push') end diff --git a/qa/qa/specs/features/browser_ui/5_package/infrastructure_registry/terraform_module_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/infrastructure_registry/terraform_module_registry_spec.rb index e8c58fb161f..75512ba1eea 100644 --- a/qa/qa/specs/features/browser_ui/5_package/infrastructure_registry/terraform_module_registry_spec.rb +++ b/qa/qa/specs/features/browser_ui/5_package/infrastructure_registry/terraform_module_registry_spec.rb @@ -54,11 +54,7 @@ module QA ]) end - Resource::Tag.fabricate_via_api! do |tag| - tag.project = imported_project - tag.ref = imported_project.default_branch - tag.name = "1.0.0" - end + create(:tag, project: imported_project, ref: imported_project.default_branch, name: '1.0.0') Flow::Pipeline.visit_latest_pipeline |