CE upstream - 2018-06-07 18:23 UTC
Files to resolve:
-
Alexis Reigel Please resolve (UU) app/views/admin/appearances/_form.html.haml
-
@lbennett Please resolve (UU) app/views/groups/labels/index.html.haml
-
@andr3 Please resolve (UU) app/views/projects/pipelines/_with_tabs.html.haml
-
@lbennett Please resolve (UU) app/views/shared/_label_row.html.haml
-
@dbalexandre Please resolve (UU) db/schema.rb
-
@mayra-cabrera Please resolve (UU) doc/topics/autodevops/index.md
-
Alexis Reigel Please resolve (AA) lib/gitlab/favicon.rb
-
Alexis Reigel Please resolve (AA) spec/lib/gitlab/favicon_spec.rb
-
@balasankarc Please resolve (UU) spec/lib/gitlab/usage_data_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!
@lbennett 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 Douwe Maan