CE upstream - 2018-02-28 18:24 UTC
Files to resolve:
-
@rymai Please resolve (UU) app/assets/javascripts/ide/components/ide_context_bar.vue
-
@rymai Please resolve (UU) app/assets/javascripts/ide/components/repo_commit_section.vue
-
@rymai Please resolve (UU) app/assets/javascripts/ide/stores/actions.js
-
@marcia Please resolve (UU) doc/README.md
-
saberd Please resolve (UU) doc/user/project/merge_requests/index.md
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-28
branch.
Thanks in advance!
@rymai 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 Rémy Coutable