Skip to content

Manual CE->EE merge

Sean McGivern requested to merge manual-ce-ee-merge into master

@DouweM could you review / approve please?

I had these conflicts:

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

	added by us:     ee/spec/fixtures/emails/service_desk_legacy.eml
	both deleted:    spec/fixtures/emails/wrong_incoming_email_token.eml
	both added:      spec/fixtures/emails/wrong_issue_incoming_email_token.eml
	both modified:   spec/serializers/pipeline_serializer_spec.rb

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	spec/fixtures/emails/wrong_issue_incoming_email_token.eml~24985807dc9e642f1ac2ca6b6d24f086f8eb4282
	spec/fixtures/emails/wrong_issue_incoming_email_token.eml~HEAD

All of them were resolved by taking the file we added (even the double-add; the file was the same in both versions). The only actual conflict was in the pipeline serialiser spec which came from your MR.

Merge request reports