From: "Jake the Dog" <jake@adventuretime.ooo>
To: incoming+gitlabhq-gitlabhq-project_id-auth_token-merge-request@appmail.adventuretime.ooo
Subject: new-branch-with-a-patch
Date: Wed, 31 Oct 2018 17:27:52 +0100
X-Mailer: MailMate (1.12r5523)
Message-ID: <7BE7C2E6-F0D9-4C85-9F55-B2A4BA01BFEC@gitlab.com>
MIME-Version: 1.0
Content-Type: multipart/mixed;
 boundary="=_MailMate_D2C4B06A-4F8D-4AAB-B247-C507E35AAED6_="


--=_MailMate_D2C4B06A-4F8D-4AAB-B247-C507E35AAED6_=

This applies nicely to a branch freshly created from the root-ref

The other attachments in this email are ignored

--=_MailMate_D2C4B06A-4F8D-4AAB-B247-C507E35AAED6_=
Content-Disposition: attachment;
 filename=0002-This-does-not-apply-to-the-feature-branch.patch
Content-Transfer-Encoding: quoted-printable

=46rom 00c68c2b4f954370ce82a1162bc29c13f524897e Mon Sep 17 00:00:00 2001
From: Patch user <patchuser@gitlab.org>
Date: Mon, 22 Oct 2018 11:05:48 +0200
Subject: [PATCH] This does not apply to the `feature` branch

---
 files/ruby/feature.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 files/ruby/feature.rb

diff --git a/files/ruby/feature.rb b/files/ruby/feature.rb
new file mode 100644
index 0000000..fef26e4
--- /dev/null
+++ b/files/ruby/feature.rb
@@ -0,0 +1,5 @@
+class Feature
+  def bar
+    puts 'foo'
+  end
+end
-- =

2.19.1

--=_MailMate_D2C4B06A-4F8D-4AAB-B247-C507E35AAED6_=
Content-Disposition: attachment; filename=0001-A-commit-from-a-patch.patch
Content-Transfer-Encoding: quoted-printable

=46rom 3fee0042e610fb3563e4379e316704cb1210f3de Mon Sep 17 00:00:00 2001
From: Patch user <patchuser@gitlab.org>
Date: Thu, 18 Oct 2018 13:40:35 +0200
Subject: [PATCH] A commit from a patch

---
 README | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README b/README
index 3742e48..e40a3b9 100644
--- a/README
+++ b/README
@@ -1 +1,3 @@
 Sample repo for testing gitlab features
+
+This was applied in a patch!
-- =

2.19.1


--=_MailMate_D2C4B06A-4F8D-4AAB-B247-C507E35AAED6_=
Content-Disposition: attachment; filename=really-not-a-patch.png
Content-Type: image/png
Content-Transfer-Encoding: base64

[encoded data, 7700 characters]
E+AEOAFWAv8PxvdR0yK8jugAAAAASUVORK5CYII=

--=_MailMate_D2C4B06A-4F8D-4AAB-B247-C507E35AAED6_=--
