CE upstream - 2018-04-02 21:40 UTC
Files to resolve:
-
@dzaporozhets Please resolve (UU) app/views/projects/deploy_keys/_index.html.haml
-
@axil Please resolve (UU) doc/ci/pipelines.md
-
@axil Please resolve (UU) doc/ci/quick_start/README.md
-
@grzesiek Please resolve (UU) doc/ci/yaml/README.md
-
@filipa Please resolve (UU) spec/javascripts/boards/mock_data.js
-
@filipa Please resolve (UU) spec/javascripts/vue_mr_widget/mock_data.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-04-02
branch.
Thanks in advance!
@axil 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 Dmytro Zaporozhets (DZ)