CE upstream - 2018-09-04 21:21 UTC
Files to resolve:
-
@wortschi Please resolve (UU) app/views/admin/application_settings/show.html.haml
-
@dzaporozhets Please resolve (UU) app/views/groups/labels/index.html.haml
-
Roger Rüttimann Please resolve (UU) db/schema.rb
-
@rymai Please resolve (UU) qa/qa/page/project/show.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-09-04
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 Rémy Coutable