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

Fix 500 when accessing private project when not logged in See merge request !1336

Merge branch 'fix-ci-non-public-project' into 'master'
d272682a · Dmitriy Zaporozhets · f2608c41 · d4be9674 · d272682a · d272682a
Commit d272682a authored Sep 18, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

Gemfile.lock Gemfile.lock +0 -3

application_controller.rb app/controllers/ci/application_controller.rb +1 -3

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -928,6 +928,3 @@ DEPENDENCIES
  webmock (~> 1.21.0)
  whenever (~> 0.8.4)
  wikicloth (= 0.8.1)
-
-BUNDLED WITH
-   1.10.6
--- 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