Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-09 20:19:27 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-05-09 20:19:27 +0300
commit74520f23db51c95b4aea8856fb51c4246785f776 (patch)
treeae6411f58e16b60cba1d5da3c150f07d01852852 /app/controllers/projects/builds_controller.rb
parentbaef6728fa4e8e515ccdeba1ea54da996f322aab (diff)
Encode state as base64 string
Diffstat (limited to 'app/controllers/projects/builds_controller.rb')
-rw-r--r--app/controllers/projects/builds_controller.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index 3c9a52a5ddd..bb1f6c5e980 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -41,7 +41,7 @@ class Projects::BuildsController < Projects::ApplicationController
def trace
respond_to do |format|
format.json do
- render json: @build.trace_with_state(params_state).merge!(id: @build.id, status: @build.status)
+ render json: @build.trace_with_state(params[:state]).merge!(id: @build.id, status: @build.status)
end
end
end
@@ -80,13 +80,6 @@ class Projects::BuildsController < Projects::ApplicationController
private
- def params_state
- begin
- JSON.parse(params[:state], symbolize_names: true)
- rescue
- end
- end
-
def build
@build ||= project.builds.unscoped.find_by!(id: params[:id])
end