CE upstream - Wednesday
Files to resolve:
-
@rymai Please resolve (UU) .gitlab-ci.yml
-
@iamphill Please resolve (UU) app/assets/javascripts/dispatcher.js
-
@jprovaznik Please resolve (UU) app/views/search/_category.html.haml
-
@nick.thomas Please resolve (UU) features/support/db_cleaner.rb
-
Kim "BKC" Carlbäcker Please resolve (UU) lib/gitlab/git/repository.rb
-
@DouweM Please resolve (UU) spec/services/issues/move_service_spec.rb
-
@nick.thomas Please resolve (UU) spec/support/db_cleaner.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-01-24
branch.
Thanks in advance!
@nick.thomas 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 Stan Hu