From b00ce1bad15af7a62d333634d5295962c8a2aa69 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Tue, 30 May 2023 17:58:42 -0700
Subject: [PATCH] Release Zulip Server 7.0.

---
 api_docs/changelog.md      |  4 ++++
 docs/overview/changelog.md | 15 +++++++--------
 version.py                 |  8 ++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/api_docs/changelog.md b/api_docs/changelog.md
index cb88d046da..2553f235c3 100644
--- a/api_docs/changelog.md
+++ b/api_docs/changelog.md
@@ -20,6 +20,10 @@ format used by the Zulip server that they are interacting with.
 
 ## Changes in Zulip 7.0
 
+**Feature level 185**
+
+No changes; feature level used for Zulip 7.0 release.
+
 **Feature level 184**
 
 * [`PATCH /scheduled_messages/<int:scheduled_message_id>`](/api/update-scheduled-message):
diff --git a/docs/overview/changelog.md b/docs/overview/changelog.md
index fee22f8a33..9edcba737c 100644
--- a/docs/overview/changelog.md
+++ b/docs/overview/changelog.md
@@ -1,15 +1,13 @@
 # Version history
 
-This page the release history for the Zulip server. See also the
-[Zulip release lifecycle](../overview/release-lifecycle.md).
+This page contains the release history for the Zulip 7.x stable
+release series. See the [current Zulip changelog][latest-changelog]
+for newer release series, or the [commit log][commit-log] for an
+up-to-date list of all changes.
 
 ## Zulip 7.x series
 
-### 7.0 -- unreleased
-
-This section is an incomplete draft of the release notes for the next
-major release, and is only updated occasionally. See the [commit
-log][commit-log] for an up-to-date list of all changes.
+### 7.0 -- 2023-05-31
 
 #### Highlights
 
@@ -82,6 +80,7 @@ log][commit-log] for an up-to-date list of all changes.
 - Improved subject lines for email notifications in topics that have
   been resolved so that email clients will thread them with the
   pre-resolution topic.
+- Improved how the Slack data import tool handles Slack threads.
 - Improved the Slack incoming integration's handling of fancier Slack
   syntax.
 - Improved notification format for most Git integrations.
@@ -3206,7 +3205,7 @@ running a version from before 1.7 should upgrade directly to 1.7.1.
 This section links to the upgrade notes from past releases, so you can
 easily read them all when upgrading across multiple releases.
 
-- [Draft upgrade notes for 7.0](#upgrade-notes-for-70)
+- [Upgrade notes for 7.0](#upgrade-notes-for-70)
 - [Upgrade notes for 6.0](#upgrade-notes-for-60)
 - [Upgrade notes for 5.0](#upgrade-notes-for-50)
 - [Upgrade notes for 4.0](#upgrade-notes-for-40)
diff --git a/version.py b/version.py
index 77e6eef014..5a3ab0f2ae 100644
--- a/version.py
+++ b/version.py
@@ -1,6 +1,6 @@
 import os
 
-ZULIP_VERSION = "7.0-beta3+git"
+ZULIP_VERSION = "7.0"
 
 # Add information on number of commits and commit hash to version, if available
 zulip_git_version_file = os.path.join(
@@ -13,8 +13,8 @@ if os.path.exists(zulip_git_version_file):
 ZULIP_VERSION = lines.pop(0).strip()
 ZULIP_MERGE_BASE = lines.pop(0).strip()
 
-LATEST_MAJOR_VERSION = "6.0"
-LATEST_RELEASE_VERSION = "6.2"
+LATEST_MAJOR_VERSION = "7.0"
+LATEST_RELEASE_VERSION = "7.0"
 LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.com/2022/11/17/zulip-6-0-released/"
 
 # Versions of the desktop app below DESKTOP_MINIMUM_VERSION will be
@@ -33,7 +33,7 @@ DESKTOP_WARNING_VERSION = "5.4.3"
 # Changes should be accompanied by documentation explaining what the
 # new level means in api_docs/changelog.md, as well as "**Changes**"
 # entries in the endpoint's documentation in `zulip.yaml`.
-API_FEATURE_LEVEL = 184
+API_FEATURE_LEVEL = 185
 
 # Bump the minor PROVISION_VERSION to indicate that folks should provision
 # only when going from an old version of the code to a newer version. Bump