CE upstream - 2018-09-06 18:22 UTC
Files to resolve:
-
@digitalmoksha Please resolve (UU) doc/administration/high_availability/gitlab.md
-
@digitalmoksha Please resolve (UU) doc/administration/high_availability/redis.md
-
@digitalmoksha Please resolve (UU) doc/api/jobs.md
-
@digitalmoksha Please resolve (UU) doc/user/markdown.md
-
@digitalmoksha Please resolve (UU) doc/user/project/integrations/jira.md
-
@digitalmoksha Please resolve (UU) doc/user/project/issue_board.md
-
@nick.thomas Please resolve (AA) lib/gitlab/tree_summary.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-09-06
branch.
Thanks in advance!
@digitalmoksha 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