diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-16 19:43:52 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-16 19:43:52 +0100 |
| commit | 76708c2c184e8bd561966ad7e617df31ceac95d1 (patch) | |
| tree | 6879bb4b3c76d9dbf6acb7ecaee2486969e5dda9 /app/views | |
| parent | 8eb51dc037ef69454731d17cdd7b13e9285fd755 (diff) | |
| parent | 76642d7a805e572ddd7608efa4f6f33de42fa1ce (diff) | |
| download | gitlab-ce-76708c2c184e8bd561966ad7e617df31ceac95d1.tar.gz | |
Merge branch 'master' into fix-merge-immediately-button
Diffstat (limited to 'app/views')
| -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) |