diff options
author | Stan Hu <stanhu@gmail.com> | 2019-06-12 12:16:40 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-06-12 12:16:40 +0000 |
commit | d36b6a70829ab15e61da34cdb30b882c92caad32 (patch) | |
tree | 83b3471bd34dce05f63056bc71e3ba5284d774f0 | |
parent | 650372eb0f1883167e26bbd1f02543b7a2d27e27 (diff) | |
parent | 0feda3aa60403d7f96b4b421ba2141ae76f11899 (diff) | |
download | gitlab-ce-d36b6a70829ab15e61da34cdb30b882c92caad32.tar.gz |
Merge branch '5615-non-admins-only-archieve-ce' into 'master'
Add EE backport for the admin view
See merge request gitlab-org/gitlab-ce!29268
4 files changed, 27 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_visibility_and_access.html.haml b/app/views/admin/application_settings/_visibility_and_access.html.haml index 03ef2924617..c07bafbe302 100644 --- a/app/views/admin/application_settings/_visibility_and_access.html.haml +++ b/app/views/admin/application_settings/_visibility_and_access.html.haml @@ -8,6 +8,7 @@ .form-group = f.label s_('ProjectCreationLevel|Default project creation protection'), class: 'label-bold' = f.select :default_project_creation, options_for_select(Gitlab::Access.project_creation_options, @application_setting.default_project_creation), {}, class: 'form-control' + = render_if_exists 'admin/application_settings/default_project_deletion_protection_setting', form: f .form-group.visibility-level-setting = f.label :default_project_visibility, class: 'label-bold' = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project.new) diff --git a/changelogs/unreleased/5615-non-admins-only-archieve-ce.yml b/changelogs/unreleased/5615-non-admins-only-archieve-ce.yml new file mode 100644 index 00000000000..ac1aa249b82 --- /dev/null +++ b/changelogs/unreleased/5615-non-admins-only-archieve-ce.yml @@ -0,0 +1,5 @@ +--- +title: Add deletion protection setting column to application_settings table +merge_request: 29268 +author: +type: other diff --git a/db/migrate/20190605104727_add_default_project_deletion_protection_to_application_settings.rb b/db/migrate/20190605104727_add_default_project_deletion_protection_to_application_settings.rb new file mode 100644 index 00000000000..ee04b49813b --- /dev/null +++ b/db/migrate/20190605104727_add_default_project_deletion_protection_to_application_settings.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddDefaultProjectDeletionProtectionToApplicationSettings < ActiveRecord::Migration[5.1] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_column_with_default :application_settings, :default_project_deletion_protection, :boolean, default: false, allow_null: false + end + + def down + remove_column :application_settings, :default_project_deletion_protection + end +end diff --git a/db/schema.rb b/db/schema.rb index 1755730bb72..c57a73c66da 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -194,6 +194,7 @@ ActiveRecord::Schema.define(version: 20190611161641) do t.text "encrypted_lets_encrypt_private_key" t.text "encrypted_lets_encrypt_private_key_iv" t.boolean "dns_rebinding_protection_enabled", default: true, null: false + t.boolean "default_project_deletion_protection", default: false, null: false t.index ["usage_stats_set_by_user_id"], name: "index_application_settings_on_usage_stats_set_by_user_id", using: :btree end |