diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2016-07-18 21:34:48 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2016-07-18 21:34:48 +0800 |
commit | 3be2c3f56602d82cd90ed7404f9e0fd1a1ed5254 (patch) | |
tree | b4bc8d71821e1fc1f95606a49c548adbe0b85de3 /app/controllers/projects/artifacts_controller.rb | |
parent | e51d4a05b7195a98b48548c4c7260886f956b6d2 (diff) | |
parent | 4e898b9b5e1a782d226212ba6227a8ddcb5177ae (diff) | |
download | gitlab-ce-3be2c3f56602d82cd90ed7404f9e0fd1a1ed5254.tar.gz |
Merge branch 'master' into artifacts-from-ref-and-build-name
* master: (335 commits)
Disable transaction when adding index for Ci::Pipeline
added changelog
allow empty repos on import/export
Modify test for Build tabs
Add tests to project builds for pending tab
Remove unused .js-running-count class
Add test for new pending tab and update tests for running tab
Add Pending Tab to Admin Builds
added changelog
limit project expor retry to only 3
use method in validates statement
Fix spec to set import_url before attempting to create import_data
Allow a project import URL to be blank to prevent false positives preventing settings from being saved
Refactor gitlab_ci_yaml_processor variables tests
Fix CI yaml example
Align cancel and retry buttons
Remove deploy to production button
Remove irrelevant comments
Fix gitlab_ci_yaml_processor_spec.rb
Fix AddWhenAndYamlVariablesToCiBuilds migration
...
Diffstat (limited to 'app/controllers/projects/artifacts_controller.rb')
-rw-r--r-- | app/controllers/projects/artifacts_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb index bfe0781d735..f33cf238d88 100644 --- a/app/controllers/projects/artifacts_controller.rb +++ b/app/controllers/projects/artifacts_controller.rb @@ -23,10 +23,9 @@ class Projects::ArtifactsController < Projects::ApplicationController entry = build.artifacts_metadata_entry(params[:path]) if entry.exists? - render json: { archive: build.artifacts_file.path, - entry: Base64.encode64(entry.path) } + send_artifacts_entry(build, entry) else - render json: {}, status: 404 + render_404 end end |