Skip to content

Resolve 'Allow to access statuses for external CI services' conflicts

username-removed-408677 requested to merge 9-3-stable-rc3-conflict-ci into 9-3-stable-rc3

When picking https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11176 into 9.3 RC3, there was a conflict.

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   spec/serializers/job_entity_spec.rb
Edited by username-removed-408677

Merge request reports