CE upstream - 2018-05-08 21:28 UTC
Files to resolve:
-
@DouweM Please resolve (UU) app/models/project.rb
-
@ayufan Please resolve (UU) app/presenters/ci/pipeline_presenter.rb
-
@gonzoyumo Please resolve (UU) app/views/projects/pipelines/_with_tabs.html.haml
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-05-08
branch.
Thanks in advance!
@ayufan After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.
Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!
Edited by Kamil Trzciński