CE upstream - 2018-02-15 13:59 UTC
Files to resolve:
-
@filipa Please resolve (UU) app/assets/javascripts/vue_merge_request_widget/dependencies.js
-
@iamphill Please resolve (UU) config/webpack.config.js
-
@tmaczukin Please resolve (UU) doc/api/namespaces.md
-
@jamedjo Please resolve (UU) lib/gitlab/git_access.rb
-
@fjsanpedro Please resolve (UU) lib/gitlab/ldap/config.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-15
branch.
Thanks in advance!
@iamphill 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