diff options
author | Patricio Cano <suprnova32@gmail.com> | 2016-07-14 13:19:40 -0500 |
---|---|---|
committer | Patricio Cano <suprnova32@gmail.com> | 2016-07-18 17:52:29 -0500 |
commit | defb8660c08a904a385b584280f72fc6a5a94c6e (patch) | |
tree | 1a93c424e4ad3ffb3d18350fdaaaa6c43879bad1 /db | |
parent | 777a080892f710915c8f4d62864813ef388a1873 (diff) | |
download | gitlab-ce-defb8660c08a904a385b584280f72fc6a5a94c6e.tar.gz |
Added the ability to block sign ups using a domain blacklist.
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20160713205315_add_domain_blacklist_to_application_settings.rb | 22 | ||||
-rw-r--r-- | db/schema.rb | 2 |
2 files changed, 24 insertions, 0 deletions
diff --git a/db/migrate/20160713205315_add_domain_blacklist_to_application_settings.rb b/db/migrate/20160713205315_add_domain_blacklist_to_application_settings.rb new file mode 100644 index 00000000000..ecdd1bd7e5e --- /dev/null +++ b/db/migrate/20160713205315_add_domain_blacklist_to_application_settings.rb @@ -0,0 +1,22 @@ +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddDomainBlacklistToApplicationSettings < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + # When using the methods "add_concurrent_index" or "add_column_with_default" + # you must disable the use of transactions as these methods can not run in an + # existing transaction. When using "add_concurrent_index" make sure that this + # method is the _only_ method called in the migration, any other changes + # should go in a separate migration. This ensures that upon failure _only_ the + # index creation fails and can be retried or reverted easily. + # + # To disable transactions uncomment the following line and remove these + # comments: + # disable_ddl_transaction! + + def change + add_column :application_settings, :domain_blacklist_enabled, :boolean, default: false + add_column :application_settings, :domain_blacklist, :text + end +end diff --git a/db/schema.rb b/db/schema.rb index 8882377f9f4..25d94f283c9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -88,6 +88,8 @@ ActiveRecord::Schema.define(version: 20160716115710) do t.text "after_sign_up_text" t.string "repository_storage", default: "default" t.string "enabled_git_access_protocol" + t.boolean "domain_blacklist_enabled", default: false + t.text "domain_blacklist" end create_table "audit_events", force: :cascade do |t| |