CE upstream - 2018-11-16 16:21 UTC
Files to resolve:
-
@gtsiolis Please resolve (UU) app/assets/stylesheets/pages/issuable.scss
-
@yorickpeterse Please resolve (AA) app/models/ci/pipeline_enums.rb
-
@yorickpeterse Please resolve (AA) app/models/commit_status_enums.rb
-
@yorickpeterse Please resolve (AA) app/models/user_callout_enums.rb
-
@ayufan Please resolve (UU) db/schema.rb
-
@jramsay Please resolve (UU) doc/administration/uploads.md
-
@ayufan Please resolve (AA) spec/db/schema_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-11-16
branch.
Thanks in advance!
@yorickpeterse 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 Steve Xuereb