From a657167cde3b588831fbb91da8111c082479061e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20Fr=C3=B6hlich?= Date: Thu, 7 Feb 2019 22:53:57 +0100 Subject: Documented branch in feed.rss --- pages/index/feed.rss | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pages/index/feed.rss b/pages/index/feed.rss index 3605f26..8d9af04 100644 --- a/pages/index/feed.rss +++ b/pages/index/feed.rss @@ -9,20 +9,10 @@ en - Usage of integration branch + Test-1430 - This is the integration branch. If it is not, please change this message in pages/index/feed.rss - - The integration branch is used as the base branch for the testserver. Ideally it should differ - from the release branch only in the explicit changes for the testserver (other icon and styles). - - For a test campaign you should create a new branch (something like "testserver-<campaign name>") - and merge in the bug-branches which are to be tested in the campaign. After the campaign is - finished the testserver should be reverted to the integration branch. - - If a patch is handed off to critical to be installed on the production system, the patch is - usually also merged into the release branch (so it continues to mirror the production system). - Then the patch should also be merged into the integration branch for the same reason. + This is the branch to test bug-1430. Mail address checking on signup should be enabled, + so you'll have to use real mail addresses. https://wiki.cacert.org/Software/Assessment/testserver/setup#Changes_to_the_release_branch -- cgit v1.2.1