diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-22 19:32:55 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2016-11-22 19:34:54 +0300 |
| commit | fc9f8e5936808e3a4d7b95db4e3012922278bea5 (patch) | |
| tree | a5603dc6a8df0eb92325223efc3322cf8d7e9387 | |
| parent | cf7239ab4d23f257fd07fa9d1900b3372eacbc3f (diff) | |
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 |