Merge branch 'master' into simplify_controllers2

Conflicts:
	app/controllers/commits_controller.rb
	app/controllers/refs_controller.rb

1 files changed, 36 insertions, 0 deletions

diff --git a/app/controllers/commit_controller.rb b/app/controllers/commit_controller.rb
new file mode 100644
index 00000000000..de0d5b2ee7d
--- /dev/null
+++ b/app/controllers/commit_controller.rb
@@ -0,0 +1,36 @@
+# Controller for a specific Commit
+#
+# Not to be confused with CommitsController, plural.
+class CommitController < ApplicationController
+  before_filter :project
+  layout "project"
+
+  # Authorize
+  before_filter :add_project_abilities
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    result = CommitLoad.new(project, current_user, params).execute
+
+    @commit = result[:commit]
+    git_not_found! unless @commit
+
+    @suppress_diff    = result[:suppress_diff]
+    @note             = result[:note]
+    @line_notes       = result[:line_notes]
+    @notes_count      = result[:notes_count]
+    @comments_allowed = true
+
+    respond_to do |format|
+      format.html do
+        if result[:status] == :huge_commit
+          render "huge_commit" and return
+        end
+      end
+
+      format.patch
+    end
+  end
+end