diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-22 13:27:32 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-22 13:27:32 +0000 |
| commit | d4d522b683a9f31cc4e0715d943eae30118293d2 (patch) | |
| tree | 31b58d0841a668174b803337a9d5005bbb64ff77 /app/controllers/projects/merge_requests_controller.rb | |
| parent | b1b5060dbad15975184ec20a1914c7c48fc804db (diff) | |
| download | gitlab-ce-revert-7a5e653f.tar.gz | |
Revert "Merge branch 'hide-empty-merge-request-diffs' into 'master'"revert-7a5e653f
This reverts merge request !7568
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index dbbd2ad849e..b343ba0b744 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -82,12 +82,12 @@ class Projects::MergeRequestsController < Projects::ApplicationController @merge_request_diff = if params[:diff_id] - @merge_request.merge_request_diffs.viewable.find(params[:diff_id]) + @merge_request.merge_request_diffs.find(params[:diff_id]) else @merge_request.merge_request_diff end - @merge_request_diffs = @merge_request.merge_request_diffs.viewable.select_without_diff + @merge_request_diffs = @merge_request.merge_request_diffs.select_without_diff @comparable_diffs = @merge_request_diffs.select { |diff| diff.id < @merge_request_diff.id } if params[:start_sha].present? @@ -417,7 +417,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController response = { title: merge_request.title, - sha: (merge_request.diff_head_commit.short_id if merge_request.diff_head_sha), + sha: merge_request.diff_head_commit.short_id, status: status, coverage: coverage } @@ -564,7 +564,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController def define_pipelines_vars @pipelines = @merge_request.all_pipelines - if @pipelines.present? && @merge_request.commits.present? + if @pipelines.present? @pipeline = @pipelines.first @statuses = @pipeline.statuses.relevant end |