Add latest changes from gitlab-org/gitlab@master

6 files changed, 103 insertions, 3 deletions

diff --git a/db/docs/dependency_proxy_packages_settings.yml b/db/docs/dependency_proxy_packages_settings.yml
new file mode 100644
index 00000000000..dcb43553f81
--- /dev/null
+++ b/db/docs/dependency_proxy_packages_settings.yml
@@ -0,0 +1,10 @@
+---
+table_name: dependency_proxy_packages_settings
+classes:
+- DependencyProxy::Packages::Setting
+feature_categories:
+- dependency_proxy
+description: Settings for the dependency proxy for packages.
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120894
+milestone: '16.1'
+gitlab_schema: gitlab_main
diff --git a/db/migrate/20230516125656_create_dependency_proxy_packages_settings.rb b/db/migrate/20230516125656_create_dependency_proxy_packages_settings.rb
new file mode 100644
index 00000000000..19d6066aef5
--- /dev/null
+++ b/db/migrate/20230516125656_create_dependency_proxy_packages_settings.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class CreateDependencyProxyPackagesSettings < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  TABLE_NAME = :dependency_proxy_packages_settings
+
+  def up
+    with_lock_retries do
+      create_table TABLE_NAME, id: false, if_not_exists: true do |t|
+        t.timestamps_with_timezone null: false
+
+        t.references :project,
+          primary_key: true,
+          default: nil,
+          index: false,
+          foreign_key: { to_table: :projects, on_delete: :cascade }
+
+        t.boolean :enabled, default: false
+        t.text :maven_external_registry_url, null: true, limit: 255
+        t.binary :encrypted_maven_external_registry_username, null: true
+        t.binary :encrypted_maven_external_registry_username_iv, null: true
+        t.binary :encrypted_maven_external_registry_password, null: true
+        t.binary :encrypted_maven_external_registry_password_iv, null: true
+      end
+    end
+
+    constraint = check_constraint_name(TABLE_NAME.to_s, 'encrypted_maven_external_registry_username', 'max_length')
+    add_check_constraint(TABLE_NAME, 'octet_length(encrypted_maven_external_registry_username) <= 1020', constraint)
+
+    constraint = check_constraint_name(TABLE_NAME.to_s, 'encrypted_maven_external_registry_username_iv', 'max_length')
+    add_check_constraint(TABLE_NAME, 'octet_length(encrypted_maven_external_registry_username_iv) <= 1020', constraint)
+
+    constraint = check_constraint_name(TABLE_NAME.to_s, 'encrypted_maven_external_registry_password', 'max_length')
+    add_check_constraint(TABLE_NAME, 'octet_length(encrypted_maven_external_registry_password) <= 1020', constraint)
+
+    constraint = check_constraint_name(TABLE_NAME.to_s, 'encrypted_maven_external_registry_password_iv', 'max_length')
+    add_check_constraint(TABLE_NAME, 'octet_length(encrypted_maven_external_registry_password_iv) <= 1020', constraint)
+
+    constraint = check_constraint_name(TABLE_NAME.to_s, 'maven_credentials', 'set_or_empty')
+    add_check_constraint(
+      TABLE_NAME,
+      '(num_nulls(encrypted_maven_external_registry_username, encrypted_maven_external_registry_password) = 0)
+       OR
+       (num_nulls(encrypted_maven_external_registry_username, encrypted_maven_external_registry_password) = 2)',
+      constraint
+    )
+  end
+
+  def down
+    drop_table TABLE_NAME
+  end
+end
diff --git a/db/post_migrate/20230602112904_change_user_preferences_defaults.rb b/db/post_migrate/20230602112904_change_user_preferences_defaults.rb
new file mode 100644
index 00000000000..98d93979039
--- /dev/null
+++ b/db/post_migrate/20230602112904_change_user_preferences_defaults.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class ChangeUserPreferencesDefaults < Gitlab::Database::Migration[2.1]
+  enable_lock_retries!
+
+  def change
+    change_column_default(:user_preferences, :tab_width, from: nil, to: 8)
+    change_column_default(:user_preferences, :time_display_relative, from: nil, to: true)
+    change_column_default(:user_preferences, :render_whitespace_in_code, from: nil, to: false)
+  end
+end
diff --git a/db/schema_migrations/20230516125656 b/db/schema_migrations/20230516125656
new file mode 100644
index 00000000000..779b304284b
--- /dev/null
+++ b/db/schema_migrations/20230516125656
@@ -0,0 +1 @@
+693293c630a849e387820e4b023590595801983a40cfb879205c673a3e2dba3d
\ No newline at end of file
diff --git a/db/schema_migrations/20230602112904 b/db/schema_migrations/20230602112904
new file mode 100644
index 00000000000..9384d768b54
--- /dev/null
+++ b/db/schema_migrations/20230602112904
@@ -0,0 +1 @@
+de2fe5c2a2669efb9ed0e17442e11a6e1d85d2eabe5e8a9810251e2bc85d4466
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 904b6a3e79c..adf9ef3bac6 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -15162,6 +15162,24 @@ CREATE SEQUENCE dependency_proxy_manifests_id_seq
 
 ALTER SEQUENCE dependency_proxy_manifests_id_seq OWNED BY dependency_proxy_manifests.id;
 
+CREATE TABLE dependency_proxy_packages_settings (
+    created_at timestamp with time zone NOT NULL,
+    updated_at timestamp with time zone NOT NULL,
+    project_id bigint NOT NULL,
+    enabled boolean DEFAULT false,
+    maven_external_registry_url text,
+    encrypted_maven_external_registry_username bytea,
+    encrypted_maven_external_registry_username_iv bytea,
+    encrypted_maven_external_registry_password bytea,
+    encrypted_maven_external_registry_password_iv bytea,
+    CONSTRAINT check_14a2818907 CHECK (((num_nulls(encrypted_maven_external_registry_username, encrypted_maven_external_registry_password) = 0) OR (num_nulls(encrypted_maven_external_registry_username, encrypted_maven_external_registry_password) = 2))),
+    CONSTRAINT check_353c7ecafd CHECK ((octet_length(encrypted_maven_external_registry_username) <= 1020)),
+    CONSTRAINT check_ac55c514a5 CHECK ((char_length(maven_external_registry_url) <= 255)),
+    CONSTRAINT check_c6f700648d CHECK ((octet_length(encrypted_maven_external_registry_password) <= 1020)),
+    CONSTRAINT check_cdf5f9a434 CHECK ((octet_length(encrypted_maven_external_registry_password_iv) <= 1020)),
+    CONSTRAINT check_fd5def68ba CHECK ((octet_length(encrypted_maven_external_registry_username_iv) <= 1020))
+);
+
 CREATE TABLE deploy_keys_projects (
     id integer NOT NULL,
     deploy_key_id integer NOT NULL,
@@ -23595,13 +23613,13 @@ CREATE TABLE user_preferences (
     roadmaps_sort character varying,
     first_day_of_week integer,
     timezone character varying,
-    time_display_relative boolean,
+    time_display_relative boolean DEFAULT true,
     projects_sort character varying(64),
     show_whitespace_in_diffs boolean DEFAULT true NOT NULL,
     sourcegraph_enabled boolean,
     setup_for_company boolean,
-    render_whitespace_in_code boolean,
-    tab_width smallint,
+    render_whitespace_in_code boolean DEFAULT false,
+    tab_width smallint DEFAULT 8,
     view_diffs_file_by_file boolean DEFAULT false NOT NULL,
     gitpod_enabled boolean DEFAULT false NOT NULL,
     markdown_surround_selection boolean DEFAULT true NOT NULL,
@@ -27094,6 +27112,9 @@ ALTER TABLE ONLY dependency_proxy_manifest_states
 ALTER TABLE ONLY dependency_proxy_manifests
     ADD CONSTRAINT dependency_proxy_manifests_pkey PRIMARY KEY (id);
 
+ALTER TABLE ONLY dependency_proxy_packages_settings
+    ADD CONSTRAINT dependency_proxy_packages_settings_pkey PRIMARY KEY (project_id);
+
 ALTER TABLE ONLY deploy_keys_projects
     ADD CONSTRAINT deploy_keys_projects_pkey PRIMARY KEY (id);
 
@@ -36854,6 +36875,9 @@ ALTER TABLE ONLY vulnerability_user_mentions
 ALTER TABLE ONLY vulnerability_user_mentions
     ADD CONSTRAINT fk_rails_a18600f210_tmp FOREIGN KEY (note_id) REFERENCES notes(id_convert_to_bigint) ON DELETE CASCADE NOT VALID;
 
+ALTER TABLE ONLY dependency_proxy_packages_settings
+    ADD CONSTRAINT fk_rails_a248d0c26f FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY todos
     ADD CONSTRAINT fk_rails_a27c483435 FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;