Skip to content

G
gitlab-ce
Commit 4b8dd9b0 authored by Mike Greiling's avatar Mike Greiling
Browse files
Options

fix conflicts in app/views/projects/jobs/_sidebar.html.haml

parent 4c0d0dfa
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/views/projects/jobs/_sidebar.html.haml
View file @ 4b8dd9b0
...@@ -33,11 +33,7 @@ ...@@ -33,11 +33,7 @@
= link_to download_project_job_artifacts_path(@project, @build), rel: 'nofollow', download: '', class: 'btn btn-sm btn-default' do = link_to download_project_job_artifacts_path(@project, @build), rel: 'nofollow', download: '', class: 'btn btn-sm btn-default' do
Download Download
<<<<<<< HEAD
- if @build.browsable_artifacts? - if @build.browsable_artifacts?
=======
- if @build.artifacts_metadata?
>>>>>>> upstream/master
= link_to browse_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-default' do = link_to browse_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-default' do
Browse Browse
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7