CE upstream - 2018-06-04 14:04 UTC
Files to resolve:
-
@grzesiek Please resolve (UU) app/models/ci/pipeline.rb
-
@fjsanpedro Please resolve (AA) app/views/search/results/_blob_data.html.haml
-
@lulalala Please resolve (UU) lib/gitlab/slash_commands/command.rb
-
@dosuken123 Please resolve (UU) spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-06-04
branch.
Thanks in advance!
@dosuken123 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 Grzegorz Bizon