From 7cad597f6c8ba794c6852e23d718ed7827da35c6 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Thu, 16 Mar 2017 20:18:57 -0700 Subject: Revert "Merge branch '8836-mr-revert' into 'master' This reverts commit 68e40bd49fde7b790bb31b9ac85a249bedd817d2, reversing changes made to 2d1f823b4c8b60cee525384cb52e547d2be8925a. --- changelogs/unreleased/option-to-be-notified-of-own-activity.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelogs/unreleased/option-to-be-notified-of-own-activity.yml (limited to 'changelogs') diff --git a/changelogs/unreleased/option-to-be-notified-of-own-activity.yml b/changelogs/unreleased/option-to-be-notified-of-own-activity.yml new file mode 100644 index 00000000000..c2e0410cc33 --- /dev/null +++ b/changelogs/unreleased/option-to-be-notified-of-own-activity.yml @@ -0,0 +1,4 @@ +--- +title: Add option to receive email notifications about your own activity +merge_request: 8836 +author: Richard Macklin -- cgit v1.2.1 From dac68bc684863fa08bed8bf8397f9e4bd6a0fa6d Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 24 Mar 2017 15:07:32 -0700 Subject: Update CHANGELOG entry --- changelogs/unreleased/option-to-be-notified-of-own-activity.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'changelogs') diff --git a/changelogs/unreleased/option-to-be-notified-of-own-activity.yml b/changelogs/unreleased/option-to-be-notified-of-own-activity.yml index c2e0410cc33..542287a09be 100644 --- a/changelogs/unreleased/option-to-be-notified-of-own-activity.yml +++ b/changelogs/unreleased/option-to-be-notified-of-own-activity.yml @@ -1,4 +1,4 @@ --- title: Add option to receive email notifications about your own activity -merge_request: 8836 +merge_request: 10032 author: Richard Macklin -- cgit v1.2.1