diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2015-12-28 11:21:01 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-01-14 12:48:14 +0100 |
| commit | 9e0e9342a47022a9caaa4a5596ec3ddb91fddc58 (patch) | |
| tree | 89fa81e680af6c6b88658eafe19a804731802e68 /app/views | |
| parent | 612ab584bf919a96eaaaf86ef474f8ffe7cbf2b2 (diff) | |
| download | gitlab-ce-9e0e9342a47022a9caaa4a5596ec3ddb91fddc58.tar.gz | |
Rename method that returns url to CI build artifacts download
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/builds/_build.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/builds/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/commit_statuses/_commit_status.html.haml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml index 6936e614346..7cd98c0f540 100644 --- a/app/views/admin/builds/_build.html.haml +++ b/app/views/admin/builds/_build.html.haml @@ -60,8 +60,8 @@ %td .pull-right - - if current_user && can?(current_user, :download_build_artifacts, project) && build.download_url - = link_to build.download_url, title: 'Download artifacts' do + - if current_user && can?(current_user, :download_build_artifacts, project) && build.artifacts_file.exist? + = link_to build.artifacts_download_url, title: 'Download artifacts' do %i.fa.fa-download - if current_user && can?(current_user, :manage_builds, build.project) - if build.active? diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml index 937ee293bc8..5780d7ad175 100644 --- a/app/views/projects/builds/show.html.haml +++ b/app/views/projects/builds/show.html.haml @@ -89,13 +89,13 @@ Test coverage %h1 #{@build.coverage}% - - if current_user && can?(current_user, :download_build_artifacts, @project) && @build.download_url + - if current_user && can?(current_user, :download_build_artifacts, @project) && @build.artifacts_file.exist? .build-widget.center .panel.panel-default .panel-heading Build artifacts .panel-body .btn-group{ role: :group } - = link_to "Download", @build.download_url, class: 'btn btn-sm btn-primary' + = link_to "Download", @build.artifacts_download_url, class: 'btn btn-sm btn-primary' = link_to "Browse", @build.artifacts_browse_url, class: 'btn btn-sm btn-primary' .build-widget diff --git a/app/views/projects/commit_statuses/_commit_status.html.haml b/app/views/projects/commit_statuses/_commit_status.html.haml index 74a05df24d3..5e7f55fdbff 100644 --- a/app/views/projects/commit_statuses/_commit_status.html.haml +++ b/app/views/projects/commit_statuses/_commit_status.html.haml @@ -66,8 +66,8 @@ %td .pull-right - - if current_user && can?(current_user, :download_build_artifacts, commit_status.project) && commit_status.download_url - = link_to commit_status.download_url, title: 'Download artifacts' do + - if current_user && can?(current_user, :download_build_artifacts, commit_status.project) && commit_status.artifacts_file.exist? + = link_to commit_status.artifacts_download_url, title: 'Download artifacts' do %i.fa.fa-download - if current_user && can?(current_user, :manage_builds, commit_status.project) - if commit_status.active? |