summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-10-26 08:47:09 +0100
committerPhil Hughes <me@iamphill.com>2016-10-26 08:47:09 +0100
commita2eff1a8e55b4bf513d3d752fcd6477595813dc2 (patch)
treee7d5e3e097ef85b871c7ab5b4673e6903c294144 /spec/fixtures
parent13f170fc5d182da78c3d0a7a0885628f59420ea0 (diff)
parent3d174c7198f103cdedd7c7ffb7678aff1dd4de33 (diff)
downloadgitlab-ce-a2eff1a8e55b4bf513d3d752fcd6477595813dc2.tar.gz
Merge branch 'master' into issue-board-sidebarissue-board-sidebar
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/emails/commands_in_reply.eml2
-rw-r--r--spec/fixtures/emails/commands_only_reply.eml2
2 files changed, 0 insertions, 4 deletions
diff --git a/spec/fixtures/emails/commands_in_reply.eml b/spec/fixtures/emails/commands_in_reply.eml
index 06bf60ab734..712f6f797b4 100644
--- a/spec/fixtures/emails/commands_in_reply.eml
+++ b/spec/fixtures/emails/commands_in_reply.eml
@@ -23,8 +23,6 @@ Cool!
/close
/todo
-/due tomorrow
-
On Sun, Jun 9, 2013 at 1:39 PM, eviltrout via Discourse Meta
<reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo> wrote:
diff --git a/spec/fixtures/emails/commands_only_reply.eml b/spec/fixtures/emails/commands_only_reply.eml
index aed64224b06..2d2e2f94290 100644
--- a/spec/fixtures/emails/commands_only_reply.eml
+++ b/spec/fixtures/emails/commands_only_reply.eml
@@ -21,8 +21,6 @@ X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
/close
/todo
-/due tomorrow
-
On Sun, Jun 9, 2013 at 1:39 PM, eviltrout via Discourse Meta
<reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo> wrote: