CE upstream - 2018-02-21 02:17 UTC
Files to resolve:
-
@jschatz1 Please resolve (UU) app/assets/javascripts/pages/search/init_filtered_search.js
-
@jschatz1 Please resolve (UU) app/views/projects/issues/index.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/projects/merge_requests/show.html.haml
-
@mikegreiling Please resolve (UU) config/webpack.config.js
-
@joshlambert Please resolve (UU) doc/user/project/integrations/prometheus_library/kubernetes.md
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-21
branch.
Thanks in advance!
@jschatz1 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