CE upstream - 2018-02-21 21:27 UTC
Files to resolve:
-
@okoghenun Please resolve (UU) app/assets/javascripts/dispatcher.js
-
@okoghenun Please resolve (UU) app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
-
@okoghenun Please resolve (UU) app/assets/javascripts/pages/search/init_filtered_search.js
-
@okoghenun Please resolve (UU) app/views/groups/issues.html.haml
-
@okoghenun Please resolve (UU) config/webpack.config.js
-
@joshlambert Please resolve (UU) doc/user/project/integrations/prometheus_library/kubernetes.md
-
@okoghenun Please resolve (UU) spec/javascripts/filtered_search/dropdown_user_spec.js
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!
@okoghenun 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