CE upstream - 2018-04-23 12:26 UTC (!5451) · Merge requests · GitLab.org / GitLab

🤖 GitLab Bot 🤖 requested to merge ce-to-ee-2018-04-23 into master Apr 23, 2018

Files to resolve:

@filipa Please resolve (UU) app/assets/javascripts/vue_shared/components/ci_icon.vue
@dzaporozhets Please resolve (UU) app/finders/users_finder.rb

Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-04-23 branch.

Thanks in advance! ❤

@dzaporozhets 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 Apr 23, 2018 by Dmytro Zaporozhets (DZ)

CE upstream - 2018-04-23 12:26 UTC

Merge request reports