CE upstream - 2018-10-10 14:21 UTC
Files to resolve:
-
@zj Please resolve (UU) app/controllers/admin/health_check_controller.rb
-
@zj Please resolve (UU) app/models/application_setting.rb
-
@zj Please resolve (UU) db/schema.rb
-
@zj Please resolve (UU) doc/administration/monitoring/prometheus/gitlab_metrics.md
-
@zj Please resolve (UU) doc/api/settings.md
-
@leipert Please resolve (UU) locale/gitlab.pot
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-10-10
branch.
Thanks in advance!
@zj 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 Robert Speicher