CE upstream - 2018-02-28 12:24 UTC
Files to resolve:
-
@fatihacet Please resolve (UU) app/assets/javascripts/diff_notes/diff_notes_bundle.js
-
@fatihacet Please resolve (UU) app/assets/javascripts/notes.js
-
@psimyn Please resolve (UU) app/assets/javascripts/pages/projects/merge_requests/show/index.js
-
George Tsiolis Please resolve (AA) app/assets/javascripts/sidebar/components/assignees/assignees.vue
-
@fatihacet Please resolve (UU) spec/controllers/projects/issues_controller_spec.rb
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!
@fatihacet 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