CE upstream - 2018-12-05 21:21 UTC
Files to resolve:
-
@iamphill Please resolve (UU) app/assets/javascripts/diffs/store/actions.js -
@fjsanpedro Please resolve (UU) app/models/ci/pipeline.rb -
@digitalmoksha Please resolve (AA) app/serializers/issue_board_entity.rb -
@fjsanpedro Please resolve (UU) app/services/ci/create_pipeline_service.rb -
@dzaporozhets Please resolve (UU) app/views/admin/users/index.html.haml -
@gitlab-bot Please resolve (UU) doc/user/project/clusters/index.md -
@tkuah Please resolve (UU) lib/gitlab/group_hierarchy.rb -
@mkozono Please resolve (AA) lib/system_check/rake_task/app_task.rb -
@mkozono Please resolve (AA) lib/system_check/rake_task/gitlab_task.rb -
@grzesiek Please resolve (UU) locale/gitlab.pot -
@digitalmoksha Please resolve (AA) spec/fixtures/api/schemas/entities/issue_boards.json -
@tkuah Please resolve (UU) spec/models/project_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-12-05 branch.
Thanks in advance!
@mkozono 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 and do not choose to squash the commits.
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 Phil Hughes