diff options
author | Robert Speicher <rspeicher@gmail.com> | 2012-09-17 10:06:56 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2012-09-26 16:32:21 -0400 |
commit | b389247c029b21f5e85abb5896d2cf22230c9cb1 (patch) | |
tree | a5fa81007b4d40f1580ab916efe6729f50e16254 /app/views/commits | |
parent | a21abce94f25d24b48c038e4a36974735a5b7149 (diff) | |
download | gitlab-ce-b389247c029b21f5e85abb5896d2cf22230c9cb1.tar.gz |
Use Commit#show instead of Commits#show to view a single commit
Commits#show (plural) is going to be for showing commit history on a
specific path.
Diffstat (limited to 'app/views/commits')
-rw-r--r-- | app/views/commits/_commit.html.haml | 7 | ||||
-rw-r--r-- | app/views/commits/show.html.haml | 10 |
2 files changed, 3 insertions, 14 deletions
diff --git a/app/views/commits/_commit.html.haml b/app/views/commits/_commit.html.haml index 61371d14c5f..6abea76cd14 100644 --- a/app/views/commits/_commit.html.haml +++ b/app/views/commits/_commit.html.haml @@ -1,16 +1,15 @@ %li.commit .browse_code_link_holder %p - %strong= link_to "Browse Code »", tree_project_ref_path(@project, commit.id), class: "right" + %strong= link_to "Browse Code »", tree_project_ref_path(@project, commit), class: "right" %p - = link_to commit.short_id(8), project_commit_path(@project, id: commit.id), class: "commit_short_id" + = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id" %strong.commit-author-name= commit.author_name %span.dash – = image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16 - = link_to_gfm truncate(commit.title, length: 50), project_commit_path(@project, id: commit.id), class: "row_title" + = link_to_gfm truncate(commit.title, length: 50), project_commit_path(@project, commit.id), class: "row_title" %span.committed_ago = time_ago_in_words(commit.committed_date) ago - diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml deleted file mode 100644 index d12fff96835..00000000000 --- a/app/views/commits/show.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -= render "commits/commit_box" -= render "commits/diffs", diffs: @commit.diffs -= render "notes/notes_with_form", tid: @commit.id, tt: "commit" -= render "notes/per_line_form" - - -:javascript - $(function(){ - PerLineNotes.init(); - }); |