diff options
| author | Brett Walker <bwalker@gitlab.com> | 2019-08-15 17:37:36 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-08-15 17:37:36 +0000 |
| commit | 3489dc3d7277bf478f68e1b3e0353b702f652acc (patch) | |
| tree | 896dc6ef08d8347e992365594ce7c4b0d49e6ee4 /app/controllers | |
| parent | 23754943a7ec119f123694a93c79fc07c32b7ba5 (diff) | |
| download | gitlab-ce-3489dc3d7277bf478f68e1b3e0353b702f652acc.tar.gz | |
Allow disabling group/project email notifications
- Adds UI to configure in group and project settings
- Removes notification configuration for users when
disabled at group or project level
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/groups_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects_controller.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 5472ef05d7c..886d1f99d69 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -176,6 +176,7 @@ class GroupsController < Groups::ApplicationController [ :avatar, :description, + :emails_disabled, :lfs_enabled, :name, :path, diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d4ff72c2314..e04cbf10470 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -361,6 +361,7 @@ class ProjectsController < Projects::ApplicationController :container_registry_enabled, :default_branch, :description, + :emails_disabled, :external_authorization_classification_label, :import_url, :issues_tracker, |