diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-16 18:16:03 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-16 18:16:03 +0000 |
| commit | 6374bdb3521ac08ec737733e1805a780a1d0d1b6 (patch) | |
| tree | 7aa4612df61a1207cb57b1d43474ca93423e05cc | |
| parent | d89216ee3aff33a7f74bd1a3ed9370de53575098 (diff) | |
| parent | 5fc90eec5038c8a4106665b283594ac8d5ca90ca (diff) | |
| download | gitlab-ce-6374bdb3521ac08ec737733e1805a780a1d0d1b6.tar.gz | |
Merge branch 'mr-builds-fixes' into 'master'
Link to correct (source) project on MR builds tab
Used to link to `gitlab-org/gitlab-ce/commits/<branch-name>`, now links to correct project.
See merge request !2115
| -rw-r--r-- | app/views/projects/commit_statuses/_commit_status.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/commit_statuses/_commit_status.html.haml b/app/views/projects/commit_statuses/_commit_status.html.haml index 45a00e4d259..74a05df24d3 100644 --- a/app/views/projects/commit_statuses/_commit_status.html.haml +++ b/app/views/projects/commit_statuses/_commit_status.html.haml @@ -19,11 +19,11 @@ - if defined?(commit_sha) && commit_sha %td - = link_to commit_status.short_sha, namespace_project_commit_path(@project.namespace, @project, commit_status.sha), class: "monospace" - + = link_to commit_status.short_sha, namespace_project_commit_path(commit_status.project.namespace, commit_status.project, commit_status.sha), class: "monospace" + %td - if commit_status.ref - = link_to commit_status.ref, namespace_project_commits_path(@project.namespace, @project, commit_status.ref) + = link_to commit_status.ref, namespace_project_commits_path(commit_status.project.namespace, commit_status.project, commit_status.ref) - else .light none @@ -66,7 +66,7 @@ %td .pull-right - - if current_user && can?(current_user, :download_build_artifacts, @project) && commit_status.download_url + - 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 %i.fa.fa-download - if current_user && can?(current_user, :manage_builds, commit_status.project) |