Dmytro Zaporozhets (DZ)
--- a/app/models/member.rb
+++ b/app/models/member.rb

 before_validation :generate_invite_token, on: :create, if: -> (member) { member.invite_email.present? }
 after_create :send_invite, if: :invite?
+ after_create :create_notification_setting, unless: :invite?
--- a/spec/models/notification_setting_spec.rb 0 → 100644
+++ b/spec/models/notification_setting_spec.rb 0 → 100644
+require 'rails_helper'
+
+RSpec.describe NotificationSetting, type: :model do
+ describe "Associations" do
+   it { is_expected.to belong_to(:user) }
+ end
+
+ describe "Validation" do
+   subject { NotificationSetting.new }
+
+   it { is_expected.to validate_presence_of(:user) }
+   it { is_expected.to validate_presence_of(:source) }
+   it { is_expected.to validate_presence_of(:level) }
--- a/db/migrate/20160328112808_create_notification_settings.rb 0 → 100644
+++ b/db/migrate/20160328112808_create_notification_settings.rb 0 → 100644
+class CreateNotificationSettings < ActiveRecord::Migration
+ def change
+   create_table :notification_settings do |t|
+     t.references :user, null: false
+     t.references :source, polymorphic: true, null: false
+     t.integer :level, default: 0, null: false
+
+     t.timestamps null: false
--- a/app/assets/javascripts/project.js.coffee
+++ b/app/assets/javascripts/project.js.coffee
   $('.update-notification').on 'click', (e) ->
     e.preventDefault()
     notification_level = $(@).data 'notification-level'
-     $('#notification_level').val(notification_level)
+     label = $(@).data 'notification-title'
+     $('#notification_setting_level').val(notification_level)
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
-           .level-title
-             Disabled
-           %p You will not get any notifications via email

-       .radio
-         = f.label :notification_level, value: Notification::N_MENTION do
-           = f.radio_button :notification_level, Notification::N_MENTION
-           .level-title
-             On Mention
-           %p You will receive notifications only for comments in which you were @mentioned
+     = form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications prepend-top-default' } do |f|
+       .form-group
+         = f.label :notification_email, class: "label-light"
+         = f.select :notification_email, @user.all_emails, { include_blank: false }, class: "select2"
+       .form-group
+         = f.label :notification_level, class: 'label-light'
--- a/app/models/user.rb
+++ b/app/models/user.rb
 # Note: When adding an option, it MUST go on the end of the array.
 enum project_view: [:readme, :activity, :files]

+ # Notification level
+ # Note: When adding an option, it MUST go on the end of the array.
+ #
+ # TODO: Add '_prefix: :notification' to enum when update to Rails 5. https://github.com/rails/rails/pull/19813
+ # Because user.notification_disabled? is much better than user.disabled?
+ enum notification_level: [:disabled, :participating, :watch, :global, :mention]
--- a/app/views/profiles/notifications/_group_settings.html.haml 0 → 100644
+++ b/app/views/profiles/notifications/_group_settings.html.haml 0 → 100644
+%li.notification-list-item
+ %span.notification.fa.fa-holder.append-right-5
+   - if setting.global?
+     = notification_icon(current_user.notification_level)
+   - else
+     = notification_icon(setting.level)
+
+ %span.str-truncated
+   = link_to group.name, group_path(group)
+
+ .pull-right
+   = form_for [group, setting], remote: true, html: { class: 'update-notifications' } do |f|
+     = f.select :level, NotificationSetting.levels.keys, {}, class: 'form-control trigger-submit'
--- a/app/controllers/groups/notification_settings_controller.rb 0 → 100644
+++ b/app/controllers/groups/notification_settings_controller.rb 0 → 100644
+class Groups::NotificationSettingsController < Groups::ApplicationController
+ def update
--- a/db/migrate/20160328115649_migrate_new_notification_setting.rb 0 → 100644
+++ b/db/migrate/20160328115649_migrate_new_notification_setting.rb 0 → 100644
+# This migration will create one row of NotificationSetting for each Member row
+# It can take long time on big instances.
+#
+# This migration can be done online but with following effects:
+# - during migration some users will receive notifications based on their global settings (project/group settings will be ignored)
+# - its possible to get duplicate records for notification settings since we don't create uniq index yet
+#
+class MigrateNewNotificationSetting < ActiveRecord::Migration
+ def up
+   timestamp = Time.now
+   execute "INSERT INTO notification_settings ( user_id, source_id, source_type, level, created_at, updated_at ) SELECT user_id, source_id, source_type, notification_level, '#{timestamp}', '#{timestamp}' FROM members WHERE user_id IS NOT NULL"