CE upstream - 2018-02-22 15:26 UTC
Files to resolve:
-
@markglenfletcher Please resolve (UU) CHANGELOG.md
-
@ClemMakesApps Please resolve (UU) app/assets/javascripts/dispatcher.js
-
@rymai Please resolve (UU) app/assets/javascripts/gl_dropdown.js
-
@iamphill Please resolve (UU) app/assets/javascripts/labels_select.js
-
@andr3 Please resolve (AU) changelogs/unreleased-ee/4929-internationalize-lock-files.yml
-
@ClemMakesApps Please resolve (UU) config/webpack.config.js
-
@rymai Please resolve (AU) ee/changelogs/unreleased/fix-show-sidebar-sub-level-items-for-billing.yml
-
@rymai Please resolve (AU) ee/changelogs/unreleased/fix-validation-of-environment-scope-for-variables.yml
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-22
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