diff options
author | Robert Speicher <rspeicher@gmail.com> | 2012-09-25 18:46:19 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2012-09-26 16:32:23 -0400 |
commit | 99d391332fa9a6c11e93bd19295425167661b972 (patch) | |
tree | ec381458fcd3652ffc067c927cf8b912ce0f8e23 /app/controllers/commit_controller.rb | |
parent | c058e3903e01b950d19fe8ce86702f24083c8395 (diff) | |
download | gitlab-ce-99d391332fa9a6c11e93bd19295425167661b972.tar.gz |
Add a "patch" MIME type, and render it like a normal view in Commit#show
Diffstat (limited to 'app/controllers/commit_controller.rb')
-rw-r--r-- | app/controllers/commit_controller.rb | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/app/controllers/commit_controller.rb b/app/controllers/commit_controller.rb index 73a556144ed..de0d5b2ee7d 100644 --- a/app/controllers/commit_controller.rb +++ b/app/controllers/commit_controller.rb @@ -15,19 +15,22 @@ class CommitController < ApplicationController result = CommitLoad.new(project, current_user, params).execute @commit = result[:commit] + git_not_found! unless @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 + @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 - if result[:status] == :huge_commit - render "huge_commit" and return + format.patch end end end |