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

Merge branch 'mr-builds-fixes' into 'master'
6374bdb3 · Dmitriy Zaporozhets · d89216ee · 5fc90eec · 6374bdb3
Commit 6374bdb3 authored Dec 16, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

_commit_status.html.haml app/views/projects/commit_statuses/_commit_status.html.haml +4 -4

No files found.
--- 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)