summaryrefslogtreecommitdiff
path: root/app/controllers/projects/builds_controller.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-02-08 13:53:30 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-02-11 10:29:15 +0100
commitd51e8e1b77d78dd80a9fb9d362219b8b47b83904 (patch)
tree310080a7327ef2790a2c005d8cb67bed7c13d9de /app/controllers/projects/builds_controller.rb
parent7e1453f2f01d40f53d927ff43aae1baae3b4b272 (diff)
downloadgitlab-ce-d51e8e1b77d78dd80a9fb9d362219b8b47b83904.tar.gz
Inherit build badge access permissions from project
Diffstat (limited to 'app/controllers/projects/builds_controller.rb')
-rw-r--r--app/controllers/projects/builds_controller.rb14
1 files changed, 4 insertions, 10 deletions
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index 9d419b07e53..0aef477811f 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -4,10 +4,6 @@ class Projects::BuildsController < Projects::ApplicationController
before_action :authorize_update_build!, except: [:index, :show, :status]
layout 'project'
- # Skip authentication for status badge only
- skip_before_action :authenticate_user!, :reject_blocked!, :project,
- :repository, :authorize_manage_builds!, :build, only: [:badge]
-
def index
@scope = params[:scope]
@all_builds = project.builds
@@ -51,18 +47,16 @@ class Projects::BuildsController < Projects::ApplicationController
redirect_to build_path(build)
end
- def status
- render json: @build.to_json(only: [:status, :id, :sha, :coverage], methods: :sha)
- end
-
def cancel
@build.cancel
redirect_to build_path(@build)
end
- def badge
- project = Project.find_with_namespace("#{params[:namespace_id]}/#{params[:project_id]}")
+ def status
+ render json: @build.to_json(only: [:status, :id, :sha, :coverage], methods: :sha)
+ end
+ def badge
respond_to do |format|
format.html { render_404 }
format.svg do