Incorporate feedback
This commit is contained in:
parent
8640b294fa
commit
d5486807ba
|
@ -1,10 +1,11 @@
|
|||
- blob = file.blob
|
||||
- path_to_file = file_project_job_artifacts_path(@project, @build, path: file.path)
|
||||
- external_link = blob.external_link? && @project.public?
|
||||
|
||||
%tr.tree-item.js-artifact-tree-row{ data: { link: path_to_file, external_link: "#{blob.external_link?}" } }
|
||||
%tr.tree-item.js-artifact-tree-row{ data: { link: path_to_file, external_link: "#{external_link}" } }
|
||||
%td.tree-item-file-name
|
||||
= tree_icon('file', blob.mode, blob.name)
|
||||
- if blob.external_link?
|
||||
- if external_link
|
||||
= link_to path_to_file, class: 'tree-item-file-external-link js-artifact-tree-tooltip',
|
||||
target: '_blank', rel: 'noopener noreferrer', title: _('Opens in a new window') do
|
||||
%span.str-truncated>= blob.name
|
||||
|
|
|
@ -325,7 +325,7 @@ Settings.pages['protocol'] ||= Settings.pages.https ? "https" : "http"
|
|||
Settings.pages['url'] ||= Settings.__send__(:build_pages_url)
|
||||
Settings.pages['external_http'] ||= false unless Settings.pages['external_http'].present?
|
||||
Settings.pages['external_https'] ||= false unless Settings.pages['external_https'].present?
|
||||
Settings.pages['artifacts_server'] ||= Settings.pages['enabled']
|
||||
Settings.pages['artifacts_server'] ||= Settings.pages['enabled'] if Settings.pages['artifacts_server'].nil?
|
||||
|
||||
#
|
||||
# Git LFS
|
||||
|
|
|
@ -49,6 +49,10 @@ describe Projects::ArtifactsController do
|
|||
describe 'GET file' do
|
||||
before do
|
||||
allow(Gitlab.config.pages).to receive(:enabled).and_return(true)
|
||||
end
|
||||
|
||||
context 'when the file is served by GitLab Pages' do
|
||||
before do
|
||||
allow(Gitlab.config.pages).to receive(:artifacts_server).and_return(true)
|
||||
end
|
||||
|
||||
|
@ -69,6 +73,26 @@ describe Projects::ArtifactsController do
|
|||
end
|
||||
end
|
||||
|
||||
context 'when the file is served through Rails' do
|
||||
context 'when the file exists' do
|
||||
it 'renders the file view' do
|
||||
get :file, namespace_id: project.namespace, project_id: project, job_id: job, path: 'ci_artifacts.txt'
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
expect(response).to render_template('projects/artifacts/file')
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the file does not exist' do
|
||||
it 'responds Not Found' do
|
||||
get :file, namespace_id: project.namespace, project_id: project, job_id: job, path: 'unknown'
|
||||
|
||||
expect(response).to be_not_found
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'GET raw' do
|
||||
context 'when the file exists' do
|
||||
it 'serves the file using workhorse' do
|
||||
|
|
|
@ -42,7 +42,7 @@ describe Ci::ArtifactBlob do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#url' do
|
||||
describe '#external_url' do
|
||||
before do
|
||||
allow(Gitlab.config.pages).to receive(:enabled).and_return(true)
|
||||
allow(Gitlab.config.pages).to receive(:artifacts_server).and_return(true)
|
||||
|
|
Loading…
Reference in New Issue