You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@allura.apache.org by sh...@apache.org on 2019/08/06 16:15:38 UTC

[allura] 01/02: Merge branch 'ss/8284' into ss/8285

This is an automated email from the ASF dual-hosted git repository.

shalithasuranga pushed a commit to branch ss/8285
in repository https://gitbox.apache.org/repos/asf/allura.git

commit 420940602b9f4424c6b2957b0375e97fe0305630
Merge: 8a6ab1e ce45893
Author: Shalitha Suranga <sh...@gmail.com>
AuthorDate: Mon Aug 5 21:23:44 2019 +0530

    Merge branch 'ss/8284' into ss/8285

 Allura/allura/controllers/discuss.py                     |  6 +++++-
 Allura/allura/lib/app_globals.py                         |  7 -------
 Allura/allura/lib/utils.py                               |  5 +++--
 Allura/allura/model/auth.py                              | 16 +++++++++-------
 Allura/allura/tasks/notification_tasks.py                | 15 ++++++++++++++-
 .../{usermentions_email.txt => usermentions_email.md}    |  6 +++---
 6 files changed, 34 insertions(+), 21 deletions(-)