CE upstream - 2018-05-22 12:51 UTC
Files to resolve:
-
George Tsiolis Please resolve (UU) spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js
-
@ifarkas Please resolve (UU) spec/models/project_spec.rb
-
@ifarkas Please resolve (UU) spec/requests/api/projects_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-05-22
branch.
Thanks in advance!
@ifarkas 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 Filipa Lacerda