diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-05-16 12:42:34 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-05-16 14:57:42 -0300 |
| commit | 09765cdde918956310549b10b2b2a466a5b08d38 (patch) | |
| tree | 6cfa823cecce691f339a0b3198524dcf9c773acc | |
| parent | 7bb84e64979edda8e76f077bd58aeb35857aec23 (diff) | |
| download | gitlab-ce-issue_14684.tar.gz | |
fix default send confirmation valueissue_14684
| -rw-r--r-- | app/models/application_setting.rb | 3 | ||||
| -rw-r--r-- | db/migrate/20160516174813_add_send_user_confirmation_email_to_application_settings.rb (renamed from db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb) | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 1a10768655f..f5079f92444 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -120,7 +120,8 @@ class ApplicationSetting < ActiveRecord::Base recaptcha_enabled: false, akismet_enabled: false, repository_checks_enabled: true, - disabled_oauth_sign_in_sources: [] + disabled_oauth_sign_in_sources: [], + send_user_confirmation_email: false ) end diff --git a/db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb b/db/migrate/20160516174813_add_send_user_confirmation_email_to_application_settings.rb index f92ef960509..c34e7ba5409 100644 --- a/db/migrate/20160421141709_add_send_confirmation_email_to_application_settings.rb +++ b/db/migrate/20160516174813_add_send_user_confirmation_email_to_application_settings.rb @@ -1,4 +1,4 @@ -class AddSendConfirmationEmailToApplicationSettings < ActiveRecord::Migration +class AddSendUserConfirmationEmailToApplicationSettings < ActiveRecord::Migration def up add_column :application_settings, :send_user_confirmation_email, :boolean, default: false |