summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-08-25 15:04:15 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-08-25 15:04:15 +0800
commitdd8afbf05d0727a061e8d7bc1bc3c1db5a666116 (patch)
treec2cbfbf318ff30cfdf4cfc23edd037aecd5a30c5
parent6953d988ab141863cba4c38c52b6d1af23c9af3e (diff)
downloadgitlab-ce-dd8afbf05d0727a061e8d7bc1bc3c1db5a666116.tar.gz
Just use instance variable instead, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_14400736
-rw-r--r--app/controllers/projects/artifacts_controller.rb9
1 files changed, 2 insertions, 7 deletions
diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb
index 17c6d56c8b9..4c63bec90e5 100644
--- a/app/controllers/projects/artifacts_controller.rb
+++ b/app/controllers/projects/artifacts_controller.rb
@@ -37,8 +37,7 @@ class Projects::ArtifactsController < Projects::ApplicationController
end
def latest_succeeded
- path = ref_name_and_path.last
- target_path = artifacts_action_path(path, project, build)
+ target_path = artifacts_action_path(@path, project, build)
if target_path
redirect_to(target_path)
@@ -63,17 +62,13 @@ class Projects::ArtifactsController < Projects::ApplicationController
def build_from_ref
if params[:ref_name_and_path]
- ref_name = ref_name_and_path.first
+ ref_name, @path = extract_ref(params[:ref_name_and_path])
builds = project.latest_successful_builds_for(ref_name)
builds.find_by(name: params[:job])
end
end
- def ref_name_and_path
- @ref_name_and_path ||= extract_ref(params[:ref_name_and_path])
- end
-
def artifacts_file
@artifacts_file ||= build.artifacts_file
end