CE upstream - 2018-02-27 22:10 UTC
Files to resolve:
-
@rymai Please resolve (UU) app/services/members/approve_access_request_service.rb
-
@rymai Please resolve (UU) app/services/members/create_service.rb
-
@rymai Please resolve (UU) app/services/members/destroy_service.rb
-
@rymai Please resolve (AA) app/services/members/update_service.rb
-
@iamphill Please resolve (UU) app/views/projects/merge_requests/show.html.haml
-
@ClemMakesApps Please resolve (UU) config/webpack.config.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-27
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 Stan Hu