CE upstream - 2018-06-07 10:47 UTC
Files to resolve:
-
@stanhu Please resolve (UU) Gemfile.lock
-
@blackst0ne Please resolve (UU) Gemfile.rails5.lock
-
@annabeldunstone Please resolve (UU) app/views/layouts/devise.html.haml
-
@annabeldunstone Please resolve (UU) app/views/layouts/devise_empty.html.haml
-
@annabeldunstone Please resolve (UU) app/views/projects/project_members/index.html.haml
-
@ifarkas Please resolve (UU) spec/requests/api/commits_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-06-07
branch.
Thanks in advance!
@annabeldunstone 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!