diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-05-21 00:04:55 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-05-21 00:04:55 +0300 |
| commit | a97cb8f8b81defc2fac460aefa41d3522f388b18 (patch) | |
| tree | 84c4bd253998da06834739fbb21feac7e33f9d2c /app | |
| parent | 56eb42007ae8c3c390b35bf336884b3bad3591c5 (diff) | |
| parent | 6fb9bf87c4f202dee9815c10cad9486a1077cc99 (diff) | |
Merge branch 'issue_9013' into 'master'
Let users set notification levels in projects which they are not members
Fixes #9013
See merge request !3986
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects_controller.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index f4ec60ad2c7..6d2b6b60f13 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -101,13 +101,7 @@ class ProjectsController < Projects::ApplicationController respond_to do |format| format.html do - if current_user - @membership = @project.team.find_member(current_user.id) - - if @membership - @notification_setting = current_user.notification_settings_for(@project) - end - end + @notification_setting = current_user.notification_settings_for(@project) if current_user if @project.repository_exists? if @project.empty_repo? |