diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-26 16:36:17 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-26 16:36:17 +0200 |
| commit | cb90368a692149b4e01b50d7c6682c48cffa438b (patch) | |
| tree | 6236d6f4fd56acad1015950d483db0ba8fa3ada9 /app/views/projects/commits | |
| parent | c6f19aed51736e5945283a611eae09f32a9b5aeb (diff) | |
| parent | f127edd012bd8b6f76ac67d69aadbd7d4837258f (diff) | |
| download | gitlab-ce-cb90368a692149b4e01b50d7c6682c48cffa438b.tar.gz | |
Merge remote-tracking branch 'origin/master' into with-pipeline-view
Diffstat (limited to 'app/views/projects/commits')
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/commits/show.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index b231b584eab..655cb0ac3cb 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -10,7 +10,7 @@ = cache(cache_key) do %li.commit.js-toggle-container{ id: "commit-#{commit.short_id}" } .commit-row-title - %span.item-title.str-truncated + %span.item-title = link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message" - if commit.description? %a.text-expander.js-toggle-button ... @@ -30,5 +30,5 @@ by = commit_author_link(commit, avatar: true, size: 24) .committed_ago - #{time_ago_with_tooltip(commit.committed_date, skip_js: true)} + #{time_ago_with_tooltip(commit.committed_date)} = link_to_browse_code(project, commit) diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml index c52cf25d40a..bcdb09208aa 100644 --- a/app/views/projects/commits/show.html.haml +++ b/app/views/projects/commits/show.html.haml @@ -39,4 +39,4 @@ = spinner :javascript - CommitsList.init("#{@ref}", #{@limit}); + CommitsList.init(#{@limit}); |