Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatricio Cano <suprnova32@gmail.com>2015-09-15 04:33:24 +0300
committerPatricio Cano <suprnova32@gmail.com>2015-09-15 04:33:24 +0300
commit01cc20378be1b77bd2a40a6af257e2cf116ce26a (patch)
tree043a3d8fc24f1cea2f530ffb1122e5ad00d12a96 /app/controllers
parent8a6fb46dff970d599860b06a6c9105c503cbb89c (diff)
Notification dropdown now shows currently active level, and also shows what the actual value of `global` is, if the project has the notification level set to global.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index fad5a706f49..14c3a6028c9 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -82,7 +82,9 @@ class ProjectsController < ApplicationController
if @project.empty_repo?
render 'projects/empty'
else
- @membership_id = @project.project_members.where(user_id: current_user.id).first.id
+ unless current_user.nil?
+ @membership = @project.project_members.where(user_id: current_user.id).first
+ end
render :show
end
else