CE upstream - 2018-03-09 18:26 UTC
Files to resolve:
-
@iamphill Please resolve (UU) app/assets/javascripts/vue_merge_request_widget/dependencies.js
-
@axil Please resolve (UU) doc/ci/yaml/README.md
-
@victorwu Please resolve (UU) doc/user/permissions.md
-
@nick.thomas Please resolve (AA) lib/gitlab/verify/job_artifacts.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-03-09
branch.
Thanks in advance!
@nick.thomas 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 Lin Jen-Shin