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.

10 files changed, 43 insertions, 31 deletions

diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb
index 1e7aec005f1..83404bdc2db 100644
--- a/app/controllers/commits_controller.rb
+++ b/app/controllers/commits_controller.rb
@@ -26,25 +26,25 @@ class CommitsController < ApplicationController
     end
   end
 
-  def show
-    result = CommitLoad.new(project, current_user, params).execute
-
-    @commit = result[:commit]
-
-    if @commit
-      @suppress_diff = result[:suppress_diff]
-      @note          = result[:note]
-      @line_notes    = result[:line_notes]
-      @notes_count   = result[:notes_count]
-      @comments_allowed = true
-    else
-      return git_not_found!
-    end
-
-    if result[:status] == :huge_commit
-      render "huge_commit" and return
-    end
-  end
+  # def show
+  #   result = CommitLoad.new(project, current_user, params).execute
+
+  #   @commit = result[:commit]
+
+  #   if @commit
+  #     @suppress_diff = result[:suppress_diff]
+  #     @note          = result[:note]
+  #     @line_notes    = result[:line_notes]
+  #     @notes_count   = result[:notes_count]
+  #     @comments_allowed = true
+  #   else
+  #     return git_not_found!
+  #   end
+
+  #   if result[:status] == :huge_commit
+  #     render "huge_commit" and return
+  #   end
+  # end
 
   def compare
     result = Commit.compare(project, params[:from], params[:to])
diff --git a/app/roles/static_model.rb b/app/roles/static_model.rb
index d26c8f47501..d67af2439c7 100644
--- a/app/roles/static_model.rb
+++ b/app/roles/static_model.rb
@@ -25,6 +25,10 @@ module StaticModel
     id
   end
 
+  def new_record?
+    false
+  end
+
   def persisted?
     false
   end
diff --git a/app/views/commits/show.html.haml b/app/views/commit/show.html.haml
index d12fff96835..d12fff96835 100644
--- a/app/views/commits/show.html.haml
+++ b/app/views/commit/show.html.haml
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 &ndash;
     = 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
       &nbsp;
-
diff --git a/app/views/events/_commit.html.haml b/app/views/events/_commit.html.haml
index ed4f33c0187..ea417aa9f30 100644
--- a/app/views/events/_commit.html.haml
+++ b/app/views/events/_commit.html.haml
@@ -1,7 +1,7 @@
 - commit = CommitDecorator.decorate(commit)
 %li.commit
   %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"
     %span= commit.author_name
     &ndash;
     = image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16
diff --git a/app/views/refs/blame.html.haml b/app/views/refs/blame.html.haml
index eb66f59760b..ba0fad5286d 100644
--- a/app/views/refs/blame.html.haml
+++ b/app/views/refs/blame.html.haml
@@ -32,8 +32,8 @@
               = commit.author_name
             %td.blame_commit
               &nbsp;
-              %code= link_to commit.short_id, project_commit_path(@project, id: commit.id)
-              = link_to_gfm truncate(commit.title, length: 30), project_commit_path(@project, id: commit.id), class: "row_title" rescue "--broken encoding"
+              %code= link_to commit.short_id, project_commit_path(@project, commit)
+              = link_to_gfm truncate(commit.title, length: 30), project_commit_path(@project, commit), class: "row_title" rescue "--broken encoding"
             %td.lines
               = preserve do
                 %pre
diff --git a/app/views/repositories/_branch.html.haml b/app/views/repositories/_branch.html.haml
index 64a633be8ac..80028a82ced 100644
--- a/app/views/repositories/_branch.html.haml
+++ b/app/views/repositories/_branch.html.haml
@@ -7,7 +7,7 @@
       - if branch.name == @project.root_ref
         %span.label default
   %td
-    = link_to project_commit_path(@project, id: commit.id) do
+    = link_to project_commit_path(@project, commit) do
       %code= commit.short_id
 
     = image_tag gravatar_icon(commit.author_email), class: "", width: 16
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 9201003e2e1..9eb35b84d42 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -174,7 +174,7 @@ module Gitlab
 
     def reference_commit(identifier)
       if commit = @project.commit(identifier)
-        link_to(identifier, project_commit_path(@project, id: commit.id), html_options.merge(title: CommitDecorator.new(commit).link_title, class: "gfm gfm-commit #{html_options[:class]}"))
+        link_to(identifier, project_commit_path(@project, commit), html_options.merge(title: CommitDecorator.new(commit).link_title, class: "gfm gfm-commit #{html_options[:class]}"))
       end
     end
   end
diff --git a/spec/requests/gitlab_flavored_markdown_spec.rb b/spec/requests/gitlab_flavored_markdown_spec.rb
index 68d354b7bc7..807d17d7bbd 100644
--- a/spec/requests/gitlab_flavored_markdown_spec.rb
+++ b/spec/requests/gitlab_flavored_markdown_spec.rb
@@ -49,13 +49,13 @@ describe "Gitlab Flavored Markdown" do
     end
 
     it "should render title in commits#show" do
-      visit project_commit_path(project, id: commit.id)
+      visit project_commit_path(project, commit)
 
       page.should have_link("##{issue.id}")
     end
 
     it "should render description in commits#show" do
-      visit project_commit_path(project, id: commit.id)
+      visit project_commit_path(project, commit)
 
       page.should have_link("@#{fred.name}")
     end
@@ -175,7 +175,7 @@ describe "Gitlab Flavored Markdown" do
 
   describe "for notes" do
     it "should render in commits#show", js: true do
-      visit project_commit_path(project, id: commit.id)
+      visit project_commit_path(project, commit)
       fill_in "note_note", with: "see ##{issue.id}"
       click_button "Add Comment"
 
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index d4ee5c3316d..9900a31f232 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -298,6 +298,14 @@ describe HooksController, "routing" do
   end
 end
 
+# project_commit GET    /:project_id/commit/:id(.:format) commit#show {:id=>/[[:alnum:]]{6,40}/, :project_id=>/[^\/]+/}
+describe CommitController, "routing" do
+  it "to #show" do
+    get("/gitlabhq/commit/4246fb").should route_to('commit#show', project_id: 'gitlabhq', id: '4246fb')
+    get("/gitlabhq/commit/4246fbd13872934f72a8fd0d6fb1317b47b59cb5").should route_to('commit#show', project_id: 'gitlabhq', id: '4246fbd13872934f72a8fd0d6fb1317b47b59cb5')
+  end
+end
+
 # compare_project_commits GET    /:project_id/commits/compare(.:format)   commits#compare
 #    patch_project_commit GET    /:project_id/commits/:id/patch(.:format) commits#patch
 #         project_commits GET    /:project_id/commits(.:format)           commits#index
@@ -317,6 +325,7 @@ describe CommitsController, "routing" do
   end
 
   it_behaves_like "RESTful project resources" do
+    let(:actions)    { [:index, :show] }
     let(:controller) { 'commits' }
   end
 end