Fix conflicts in prep branches (!6117) · Merge requests · GitLab.org / GitLab · GitLab

Filipa Lacerda requested to merge 11-0-stable-ee-prepare-rc11-fix-conflicts into 11-0-stable-ee-prepare-rc11 Jun 13, 2018

I need help fixing these conflicts when merging ce to ee in the prep branches:

@reprazent app/views/devise/shared/_signup_box.html.haml
@jramsay doc/user/project/issue_board.md
@DouweM lib/api/users.rb
@reprazent locale/gitlab.pot

Thanks!

Edited Jun 13, 2018 by Filipa Lacerda