Commit d272682a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix-ci-non-public-project' into 'master'

Fix 500 when accessing private project when not logged in



See merge request !1336
parents f2608c41 d4be9674
...@@ -928,6 +928,3 @@ DEPENDENCIES ...@@ -928,6 +928,3 @@ DEPENDENCIES
webmock (~> 1.21.0) webmock (~> 1.21.0)
whenever (~> 0.8.4) whenever (~> 0.8.4)
wikicloth (= 0.8.1) wikicloth (= 0.8.1)
BUNDLED WITH
1.10.6
...@@ -10,9 +10,7 @@ module Ci ...@@ -10,9 +10,7 @@ module Ci
def authenticate_public_page! def authenticate_public_page!
unless project.public unless project.public
unless current_user authenticate_user!
redirect_to(new_user_sessions_path) and return
end
return access_denied! unless can?(current_user, :read_project, gl_project) return access_denied! unless can?(current_user, :read_project, gl_project)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment