You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2017/10/30 14:43:00 UTC
[5/6] allura git commit: Replace forgemail.url with base_url
Replace forgemail.url with base_url
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/92497a27
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/92497a27
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/92497a27
Branch: refs/heads/master
Commit: 92497a2788d40d29c5615b98fcdea9511e9cec57
Parents: 2529a31
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Aug 23 12:39:14 2017 -0400
Committer: Kenton Taylor <kt...@slashdotmedia.com>
Committed: Mon Oct 30 10:42:32 2017 -0400
----------------------------------------------------------------------
Allura/allura/model/notification.py | 2 +-
Allura/allura/model/repository.py | 2 +-
Allura/development.ini | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/92497a27/Allura/allura/model/notification.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/notification.py b/Allura/allura/model/notification.py
index 80ff6a6..c4e2c24 100644
--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -688,7 +688,7 @@ class MailFooter(object):
return cls._render('mail/footer.txt',
domain=config['domain'],
notification=notification,
- prefix=config['forgemail.url'],
+ prefix=config['base_url'],
allow_email_posting=allow_email_posting,
**kw)
http://git-wip-us.apache.org/repos/asf/allura/blob/92497a27/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 996b92f..9528885 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -62,7 +62,7 @@ from .session import repository_orm_session
log = logging.getLogger(__name__)
config = utils.ConfigProxy(
common_suffix='forgemail.domain',
- common_prefix='forgemail.url')
+)
README_RE = re.compile('^README(\.[^.]*)?$', re.IGNORECASE)
VIEWABLE_EXTENSIONS = frozenset([
http://git-wip-us.apache.org/repos/asf/allura/blob/92497a27/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index d740765..a644ae5 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -79,8 +79,6 @@ site_name = Allura
domain = localhost
; Change this to your website's full URL
base_url = http://localhost:8080
-; This should be the same as base_url
-forgemail.url = http://localhost:8080
; Change this to configure your image path and redirect link
; for the logo