diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:47:36 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:47:36 +0200 |
| commit | c993481d991333fe0750080eec98fd2e9eeda8d5 (patch) | |
| tree | 7d1fdd7926f8542b7fbf7add052004dbfd48b206 /app/controllers/ci/projects_controller.rb | |
| parent | 83f04853e9a749c3397ee7683a78b986e1070904 (diff) | |
| parent | 123669a55107514798ba531ba3a744b3ec8503ee (diff) | |
| download | gitlab-ce-git-archive-golang.tar.gz | |
Merge branch 'master' into git-archive-golanggit-archive-golang
Diffstat (limited to 'app/controllers/ci/projects_controller.rb')
| -rw-r--r-- | app/controllers/ci/projects_controller.rb | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/app/controllers/ci/projects_controller.rb b/app/controllers/ci/projects_controller.rb index 33b8ae64659..7777aa18031 100644 --- a/app/controllers/ci/projects_controller.rb +++ b/app/controllers/ci/projects_controller.rb @@ -1,24 +1,11 @@ module Ci class ProjectsController < Ci::ApplicationController - before_action :authenticate_user!, except: [:build, :badge, :show] - before_action :authenticate_public_page!, only: :show - before_action :project, only: [:build, :show, :badge, :toggle_shared_runners, :dumped_yaml] - before_action :authorize_access_project!, except: [:build, :badge, :show, :new] + before_action :project + before_action :authenticate_user!, except: [:build, :badge] + before_action :authorize_access_project!, except: [:badge] before_action :authorize_manage_project!, only: [:toggle_shared_runners, :dumped_yaml] - before_action :authenticate_token!, only: [:build] before_action :no_cache, only: [:badge] - protect_from_forgery except: :build - - layout 'ci/project', except: [:index] - - def show - @ref = params[:ref] - - @commits = @project.commits.reverse_order - # TODO: this is broken - # @commits = @commits.where(ref: @ref) if @ref - @commits = @commits.page(params[:page]).per(20) - end + protect_from_forgery # Project status badge # Image with build status for sha or ref |