CE upstream - 2018-02-07 09:27 UTC
Files to resolve:
-
George Tsiolis Please resolve (UU) app/assets/javascripts/boards/components/board_list.vue
-
Tiago Botelho Please resolve (UU) lib/gitlab/git_access.rb
-
Tiago Botelho Please resolve (UU) lib/gitlab/path_regex.rb
-
Tiago Botelho Please resolve (UU) spec/lib/gitlab/git_access_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-07
branch.
Thanks in advance!
@vsizov 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 Marin Jankovski