Release Zulip Server 4.1.

When upgrading from a pre-4.0 release, scripts/stop-server logic would
check whether supervisord configuration files were present to
determine what it needed to restart, but only considered paths to
those files that are introduced in Zulip 4.0.

docs/overview/changelog.md

@@ -7,6 +7,10 @@ up-to-date list of raw changes.
 
 ## Zulip 4.x series
 
+### 4.1 -- 2021-05-13
+
+- Fix exception upgrading to the 4.x series from older releases.
+
 ### 4.0 -- 2021-05-13
 
 #### Highlights

scripts/lib/zulip_tools.py

@@ -600,7 +600,21 @@ def is_vagrant_env_host(path: str) -> bool:
 
 
 def has_application_server() -> bool:
-    return os.path.exists("/etc/supervisor/conf.d/zulip/zulip.conf")
+    return (
+        # Current path
+        os.path.exists("/etc/supervisor/conf.d/zulip/zulip.conf")
+        # Old path, relevant for upgrades
+        or os.path.exists("/etc/supervisor/conf.d/zulip.conf")
+    )
+
+
+def has_process_fts_updates() -> bool:
+    return (
+        # Current path
+        os.path.exists("/etc/supervisor/conf.d/zulip/zulip_db.conf")
+        # Old path, relevant for upgrades
+        or os.path.exists("/etc/supervisor/conf.d/zulip_db.conf")
+    )
 
 
 def deport(netloc: str) -> str:

scripts/restart-server

@@ -17,6 +17,7 @@ from scripts.lib.zulip_tools import (
     get_config_file,
     get_tornado_ports,
     has_application_server,
+    has_process_fts_updates,
     overwrite_symlink,
 )
 
@@ -90,7 +91,7 @@ if has_application_server():
             worker_status.check_returncode()
         workers.extend(status_line.split()[0] for status_line in worker_status.stdout.splitlines())
 
-if os.path.exists("/etc/supervisor/conf.d/zulip/zulip_db.conf"):
+if has_process_fts_updates():
     workers.append("process-fts-updates")
 
 if action == "restart" and len(workers) > 0:

scripts/stop-server

@@ -7,7 +7,13 @@ import sys
 import time
 
 sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
-from scripts.lib.zulip_tools import ENDC, OKGREEN, WARNING, has_application_server
+from scripts.lib.zulip_tools import (
+    ENDC,
+    OKGREEN,
+    WARNING,
+    has_application_server,
+    has_process_fts_updates,
+)
 
 deploy_path = os.path.realpath(os.path.join(os.path.dirname(__file__), ".."))
 os.chdir(deploy_path)
@@ -22,7 +28,7 @@ logging.basicConfig(format="%(asctime)s stop-server: %(message)s", level=logging
 services = []
 
 # Start with the least-critical services:
-if os.path.exists("/etc/supervisor/conf.d/zulip/zulip_db.conf"):
+if has_process_fts_updates():
     services.append("process-fts-updates")
 
 if has_application_server():

static/styles/zulip.css

@@ -1491,8 +1491,7 @@ div.focused_table {
 
 .message-edit-feature-group {
     display: inline-flex;
-    margin-left: 10px;
+    margin: -10px auto -5px 10px;
-    margin-bottom: -5px;
     align-items: baseline;
 }
 

templates/zerver/api/changelog.md

@@ -13,7 +13,7 @@ below features are supported.
 
 **Feature level 65**
 
-No changes; feature level used for Zulip 3.0 release.
+No changes; feature level used for Zulip 4.0 release.
 
 **Feature level 64**
 

version.py

@@ -1,6 +1,6 @@
 import os
 
-ZULIP_VERSION = "4.0"
+ZULIP_VERSION = "4.1"
 
 # Add information on number of commits and commit hash to version, if available
 zulip_git_version_file = os.path.join(
@@ -14,7 +14,7 @@ ZULIP_VERSION = lines.pop(0).strip()
 ZULIP_MERGE_BASE = lines.pop(0).strip()
 
 LATEST_MAJOR_VERSION = "4.0"
-LATEST_RELEASE_VERSION = "4.0"
+LATEST_RELEASE_VERSION = "4.1"
 LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2020/07/16/zulip-3-0-released/"
 
 # Versions of the desktop app below DESKTOP_MINIMUM_VERSION will be