diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-05-16 12:42:34 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-05-16 16:53:11 -0300 |
| commit | ecce94d3aab57e099a8897a860023b8ec7acac05 (patch) | |
| tree | 63db513f4516c1e1bb68eb06f88b0c64d6020f5d | |
| parent | 7bb84e64979edda8e76f077bd58aeb35857aec23 (diff) | |
| download | gitlab-ce-ecce94d3aab57e099a8897a860023b8ec7acac05.tar.gz | |
fix default send confirmation value
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -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 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7ebe10c0f7b..eb5fee8b075 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ v 8.8.0 (unreleased) - Fix error when using link to uploads in global snippets - Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen) - Use a case-insensitive comparison in sanitizing URI schemes + - Toggle sign-up confirmation emails in application settings - Project#open_branches has been cleaned up and no longer loads entire records into memory. - Escape HTML in commit titles in system note messages - Improve multiple branch push performance by memoizing permission checking @@ -28,8 +29,6 @@ v 8.8.0 (unreleased) - Display informative message when new milestone is created - Sanitize milestones and labels titles - Support multi-line tag messages. !3833 (Calin Seciu) - - Toggle sign-up confirmation emails in application settings - - Replace Devise Async with Devise ActiveJob integration. !3902 (Connor Shea) - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea) - Added button to toggle whitespaces changes on diff view - Backport GitHub Enterprise import support from EE 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 |