diff options
author | Vladimir Shushlin <v.shushlin@gmail.com> | 2019-09-11 15:01:10 +0300 |
---|---|---|
committer | Vladimir Shushlin <v.shushlin@gmail.com> | 2019-09-18 21:26:22 +0300 |
commit | 91a4d83336179c30829fcc7fd92971c2d6b9b728 (patch) | |
tree | 87617f625c3ea4087333ff0da157d10bfb0524c7 | |
parent | 1928932388f063b064dde9d235b6474121a726c0 (diff) | |
download | gitlab-ce-pages-per-project-size-limit-db.tar.gz |
Add columns pages/artifacts size limitspages-per-project-size-limit-db
* projects
* namespaces
7 files changed, 47 insertions, 0 deletions
diff --git a/changelogs/unreleased/pages-per-project-size-limit-db.yml b/changelogs/unreleased/pages-per-project-size-limit-db.yml new file mode 100644 index 00000000000..efc7d2572d6 --- /dev/null +++ b/changelogs/unreleased/pages-per-project-size-limit-db.yml @@ -0,0 +1,5 @@ +--- +title: Add columns for per project/group max pages/artifacts sizes +merge_request: 32698 +author: +type: added diff --git a/db/migrate/20190911115056_add_projects_max_pages_size.rb b/db/migrate/20190911115056_add_projects_max_pages_size.rb new file mode 100644 index 00000000000..175c66953ed --- /dev/null +++ b/db/migrate/20190911115056_add_projects_max_pages_size.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddProjectsMaxPagesSize < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def change + add_column :projects, :max_pages_size, :integer + end +end diff --git a/db/migrate/20190911115109_add_namespaces_max_pages_size.rb b/db/migrate/20190911115109_add_namespaces_max_pages_size.rb new file mode 100644 index 00000000000..c14dfa74a5a --- /dev/null +++ b/db/migrate/20190911115109_add_namespaces_max_pages_size.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddNamespacesMaxPagesSize < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def change + add_column :namespaces, :max_pages_size, :integer + end +end diff --git a/db/migrate/20190911115207_add_projects_max_artifacts_size.rb b/db/migrate/20190911115207_add_projects_max_artifacts_size.rb new file mode 100644 index 00000000000..41cab7e5282 --- /dev/null +++ b/db/migrate/20190911115207_add_projects_max_artifacts_size.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddProjectsMaxArtifactsSize < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def change + add_column :projects, :max_artifacts_size, :integer + end +end diff --git a/db/migrate/20190911115222_add_namespaces_max_artifacts_size.rb b/db/migrate/20190911115222_add_namespaces_max_artifacts_size.rb new file mode 100644 index 00000000000..60c594c47a6 --- /dev/null +++ b/db/migrate/20190911115222_add_namespaces_max_artifacts_size.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddNamespacesMaxArtifactsSize < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def change + add_column :namespaces, :max_artifacts_size, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 39faf1e651e..e30c80949ea 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -2274,6 +2274,8 @@ ActiveRecord::Schema.define(version: 2019_09_12_061145) do t.integer "last_ci_minutes_usage_notification_level" t.integer "subgroup_creation_level", default: 1 t.boolean "emails_disabled" + t.integer "max_pages_size" + t.integer "max_artifacts_size" t.index ["created_at"], name: "index_namespaces_on_created_at" t.index ["custom_project_templates_group_id", "type"], name: "index_namespaces_on_custom_project_templates_group_id_and_type", where: "(custom_project_templates_group_id IS NOT NULL)" t.index ["file_template_project_id"], name: "index_namespaces_on_file_template_project_id" @@ -2847,6 +2849,8 @@ ActiveRecord::Schema.define(version: 2019_09_12_061145) do t.boolean "service_desk_enabled", default: true t.integer "approvals_before_merge", default: 0, null: false t.boolean "emails_disabled" + t.integer "max_pages_size" + t.integer "max_artifacts_size" t.index ["archived", "pending_delete", "merge_requests_require_code_owner_approval"], name: "projects_requiring_code_owner_approval", where: "((pending_delete = false) AND (archived = false) AND (merge_requests_require_code_owner_approval = true))" t.index ["created_at"], name: "index_projects_on_created_at" t.index ["creator_id"], name: "index_projects_on_creator_id" diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index 511b702553e..994aa95dc5e 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -143,6 +143,8 @@ excluded_attributes: - :mirror_last_update_at - :mirror_last_successful_update_at - :emails_disabled + - :max_pages_size + - :max_artifacts_size namespaces: - :runners_token - :runners_token_encrypted |