diff options
Diffstat (limited to 'app/controllers/commits_controller.rb')
-rw-r--r-- | app/controllers/commits_controller.rb | 60 |
1 files changed, 5 insertions, 55 deletions
diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb index 1e7aec005f1..bd67ee88adf 100644 --- a/app/controllers/commits_controller.rb +++ b/app/controllers/commits_controller.rb @@ -4,19 +4,19 @@ class CommitsController < ApplicationController before_filter :project layout "project" + include ExtractsPath + # Authorize before_filter :add_project_abilities before_filter :authorize_read_project! before_filter :authorize_code_access! before_filter :require_non_empty_project - before_filter :load_refs, only: :index # load @branch, @tag & @ref - before_filter :render_full_content - def index - @repo = project.repo + def show + @repo = @project.repo @limit, @offset = (params[:limit] || 40), (params[:offset] || 0) - @commits = @project.commits(@ref, params[:path], @limit, @offset) + @commits = @project.commits(@ref, @path, @limit, @offset) @commits = CommitDecorator.decorate(@commits) respond_to do |format| @@ -25,54 +25,4 @@ class CommitsController < ApplicationController format.atom { render layout: false } 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]) - - @commits = result[:commits] - @commit = result[:commit] - @diffs = result[:diffs] - @refs_are_same = result[:same] - @line_notes = [] - - @commits = CommitDecorator.decorate(@commits) - end - - def patch - @commit = project.commit(params[:id]) - - send_data( - @commit.to_patch, - type: "text/plain", - disposition: 'attachment', - filename: "#{@commit.id}.patch" - ) - end - - protected - - def load_refs - @ref ||= params[:ref].presence || params[:branch].presence || params[:tag].presence - @ref ||= @ref || @project.try(:default_branch) || 'master' - end end |