CE upstream - 2018-09-14 09:21 UTC
Files to resolve:
-
@winh Please resolve (UU) app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
-
Alexis Reigel Please resolve (UU) app/assets/javascripts/filtered_search/filtered_search_manager.js
-
Alexis Reigel Please resolve (UU) app/assets/javascripts/pages/groups/issues/index.js
-
Alexis Reigel Please resolve (UU) app/assets/javascripts/pages/groups/merge_requests/index.js
-
Alexis Reigel Please resolve (UU) app/assets/javascripts/pages/projects/issues/index/index.js
-
Alexis Reigel Please resolve (UU) app/assets/javascripts/pages/projects/merge_requests/index/index.js
-
Alexis Reigel Please resolve (UU) app/controllers/admin/runners_controller.rb
-
@dzaporozhets Please resolve (UU) app/helpers/sorting_helper.rb
-
Alexis Reigel Please resolve (UU) app/models/ci/runner.rb
-
Alexis Reigel Please resolve (UU) app/views/admin/runners/index.html.haml
-
Alexis Reigel Please resolve (UU) lib/api/runners.rb
-
Alexis Reigel Please resolve (UU) locale/gitlab.pot
-
Alexis Reigel Please resolve (UU) spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js
-
Alexis Reigel Please resolve (UU) spec/javascripts/filtered_search/dropdown_user_spec.js
-
Alexis Reigel Please resolve (UU) spec/javascripts/filtered_search/dropdown_utils_spec.js
-
Alexis Reigel Please resolve (UU) spec/javascripts/filtered_search/filtered_search_manager_spec.js
-
Alexis Reigel Please resolve (UU) spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-09-14
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 by Grzegorz Bizon