01ff084a4d
Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account. A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server resource usage with huge commits. Related to #1745, #2259 In addition, handle large commits for MergeRequests and Compare controllers. Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
44 lines
1.1 KiB
Ruby
44 lines
1.1 KiB
Ruby
# Controller for a specific Commit
|
|
#
|
|
# Not to be confused with CommitsController, plural.
|
|
class Projects::CommitController < Projects::ApplicationController
|
|
# Authorize
|
|
before_filter :authorize_read_project!
|
|
before_filter :authorize_code_access!
|
|
before_filter :require_non_empty_project
|
|
|
|
def show
|
|
result = CommitLoadContext.new(project, current_user, params).execute
|
|
|
|
@commit = result[:commit]
|
|
|
|
if @commit.nil?
|
|
git_not_found!
|
|
return
|
|
end
|
|
|
|
@suppress_diff = result[:suppress_diff]
|
|
@force_suppress_diff = result[:force_suppress_diff]
|
|
|
|
@note = result[:note]
|
|
@line_notes = result[:line_notes]
|
|
@notes_count = result[:notes_count]
|
|
@target_type = :commit
|
|
@target_id = @commit.id
|
|
|
|
@comments_allowed = @reply_allowed = true
|
|
@comments_target = { noteable_type: 'Commit',
|
|
commit_id: @commit.id }
|
|
|
|
respond_to do |format|
|
|
format.html do
|
|
if result[:status] == :huge_commit
|
|
render "huge_commit" and return
|
|
end
|
|
end
|
|
|
|
format.diff { render text: @commit.to_diff }
|
|
format.patch { render text: @commit.to_patch }
|
|
end
|
|
end
|
|
end
|