CE upstream - 2018-09-12 05:25 UTC
Files to resolve:
-
@ClemMakesApps Please resolve (UU) app/assets/javascripts/environments/components/environments_table.vue
-
@ClemMakesApps Please resolve (UU) app/assets/javascripts/notes/components/note_actions.vue
-
🙈 jacopo beschi🙉 Please resolve (UU)lib/api/triggers.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-09-12
branch.
Thanks in advance!
@ClemMakesApps 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 Robert Speicher