diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-18 09:18:49 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-18 09:18:49 +0000 |
| commit | d272682a1534020a9060767e922ddb02ab075c8b (patch) | |
| tree | 92b0af79536315f241d70a4edbae3fa07b5c71f7 /app/controllers | |
| parent | f2608c41b830d82b3c8ad3ec38ddf157d68fd7cc (diff) | |
| parent | d4be96747860ec0c5e9e64a1095a1dd95c48545c (diff) | |
| download | gitlab-ce-d272682a1534020a9060767e922ddb02ab075c8b.tar.gz | |
Merge branch 'fix-ci-non-public-project' into 'master'
Fix 500 when accessing private project when not logged in
See merge request !1336
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/ci/application_controller.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/ci/application_controller.rb b/app/controllers/ci/application_controller.rb index a5868da377f..d45c4e9caf1 100644 --- a/app/controllers/ci/application_controller.rb +++ b/app/controllers/ci/application_controller.rb @@ -10,9 +10,7 @@ module Ci def authenticate_public_page! unless project.public - unless current_user - redirect_to(new_user_sessions_path) and return - end + authenticate_user! return access_denied! unless can?(current_user, :read_project, gl_project) end |