diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-22 16:32:55 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-22 16:32:55 +0000 |
| commit | 3632f7e4e5e22ce552d73080be7812167e6426bb (patch) | |
| tree | 96b13de22cb213c4bc6ae5ec47e140c31a6e3d0f | |
| parent | 45d69bf120604edf3ec955949cd66576a8fe0d23 (diff) | |
| parent | d7bd8f128e08da9f4aa9d395d430bb35e4a5e3eb (diff) | |
| download | gitlab-ce-3632f7e4e5e22ce552d73080be7812167e6426bb.tar.gz | |
Merge branch 'hot-fix-define-pipeline-vars' into 'master'
Do not use MergeRequest#commits in define_pipelines_vars
## What does this MR do?
`MergeRequest#commits` requires merge_request_diff to be present.
This is not the case when creating a new merge request.
## What are the relevant issue numbers?
Fix up for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7568
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24798
See merge request !7664
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index dbbd2ad849e..e24a670631f 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -563,11 +563,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController def define_pipelines_vars @pipelines = @merge_request.all_pipelines - - if @pipelines.present? && @merge_request.commits.present? - @pipeline = @pipelines.first - @statuses = @pipeline.statuses.relevant - end + @pipeline = @merge_request.pipeline + @statuses = @pipeline.statuses.relevant if @pipeline.present? end def define_new_vars |