CE upstream - 2018-08-22 12:21 UTC
Files to resolve:
-
@gitlab-release-tools-bot Please resolve (UU) CHANGELOG.md
-
@iamphill Please resolve (UU) app/assets/javascripts/api.js
-
Annabel Dunstone Gray Please resolve (UU) app/assets/stylesheets/framework/variables.scss
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-08-22
branch.
Thanks in advance!
@iamphill 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 Dmytro Zaporozhets (DZ)