diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-24 00:09:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-24 00:09:27 +0300 |
commit | 17bb9dd270c78fad45851c6cc6ec6e6fdb3d23bf (patch) | |
tree | aa7235893811d97055b3fc750d139a039ae95b0a /db | |
parent | abd2c6b32aabff4654b6be9cb98b59dcd3193fc4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/post_migrate/20240123155252_remove_project_import_level_from_namespace_settings.rb | 10 | ||||
-rw-r--r-- | db/schema_migrations/20240123155252 | 1 | ||||
-rw-r--r-- | db/structure.sql | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/db/post_migrate/20240123155252_remove_project_import_level_from_namespace_settings.rb b/db/post_migrate/20240123155252_remove_project_import_level_from_namespace_settings.rb new file mode 100644 index 00000000000..bc7c362a94c --- /dev/null +++ b/db/post_migrate/20240123155252_remove_project_import_level_from_namespace_settings.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class RemoveProjectImportLevelFromNamespaceSettings < Gitlab::Database::Migration[2.2] + milestone '16.8' + enable_lock_retries! + + def change + remove_column :namespace_settings, :project_import_level, :smallint, default: 50, null: false + end +end diff --git a/db/schema_migrations/20240123155252 b/db/schema_migrations/20240123155252 new file mode 100644 index 00000000000..869d077b22a --- /dev/null +++ b/db/schema_migrations/20240123155252 @@ -0,0 +1 @@ +1383d7d49981bdb5fa5eeb54dd83520f4bd2de1e8f0cc227c1397d0bc48a66f4
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 7631fecfe7a..aad301f401c 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -19982,7 +19982,6 @@ CREATE TABLE namespace_settings ( enabled_git_access_protocol smallint DEFAULT 0 NOT NULL, unique_project_download_limit smallint DEFAULT 0 NOT NULL, unique_project_download_limit_interval_in_seconds integer DEFAULT 0 NOT NULL, - project_import_level smallint DEFAULT 50 NOT NULL, unique_project_download_limit_allowlist text[] DEFAULT '{}'::text[] NOT NULL, auto_ban_user_on_excessive_projects_download boolean DEFAULT false NOT NULL, only_allow_merge_if_pipeline_succeeds boolean DEFAULT false NOT NULL, |