diff options
| author | DJ Mountney <dj@gitlab.com> | 2017-07-10 21:20:52 +0000 |
|---|---|---|
| committer | DJ Mountney <dj@gitlab.com> | 2017-07-10 21:20:52 +0000 |
| commit | e643c0db35617d2b0ba607708322e827c15ce132 (patch) | |
| tree | 2094291da16a3c4021176f7441b865970cfeccf8 /app/views/projects/commits/_inline_commit.html.haml | |
| parent | ba4250c119df661f32bc7e72b8001798464a9785 (diff) | |
| parent | 26b6e299e1c97b956306572c5c9f6c02f428bfd7 (diff) | |
| download | gitlab-ce-e643c0db35617d2b0ba607708322e827c15ce132.tar.gz | |
Merge branch 'master' into 'catch-redis-address-error'
# Conflicts:
# lib/gitlab/current_settings.rb
Diffstat (limited to 'app/views/projects/commits/_inline_commit.html.haml')
| -rw-r--r-- | app/views/projects/commits/_inline_commit.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/commits/_inline_commit.html.haml b/app/views/projects/commits/_inline_commit.html.haml index 5fb89935467..48cefbe45f2 100644 --- a/app/views/projects/commits/_inline_commit.html.haml +++ b/app/views/projects/commits/_inline_commit.html.haml @@ -1,8 +1,8 @@ %li.commit.inline-commit .commit-row-title - = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-sha" + = link_to commit.short_id, project_commit_path(project, commit), class: "commit-sha" %span.str-truncated - = link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message" + = link_to_gfm commit.title, project_commit_path(project, commit.id), class: "commit-row-message" .pull-right #{time_ago_with_tooltip(commit.committed_date)} |