CE upstream - 2018-06-08 12:25 UTC
Files to resolve:
-
@mdelaossa Please resolve (UU) app/assets/javascripts/boards/models/list.js
-
@mdelaossa Please resolve (UU) app/assets/javascripts/boards/stores/boards_store.js
-
@smcgivern Please resolve (UU) app/finders/issues_finder.rb
-
@mdelaossa Please resolve (UU) app/services/boards/lists/create_service.rb
-
@mikegreiling Please resolve (UU) app/views/projects/settings/ci_cd/_autodevops_form.html.haml
-
@dennis Please resolve (UU) app/views/shared/issuable/_search_bar.html.haml
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-06-08
branch.
Thanks in advance!
@mdelaossa 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 Robert Speicher