Fix merge conflicts

Author: kprinssu

.changes/v0.30.2.md

@@ -0,0 +1,11 @@
+## v0.30.2 (2025-07-31)
+
+### Notice
+
+* This is a patch release, please also check [the full release note](https://github.com/TabbyML/tabby/releases/tag/v0.30.0) for 0.30.
+
+### Fixed and Improvements
+
+* Use 0.7.3 sqlx to avoid database pool timeout. [#4328](https://github.com/TabbyML/tabby/pull/4328)
+* Bump llama.cpp to b6047. [#4330](https://github.com/TabbyML/tabby/pull/4330)
+* Expose the Flash Attention LLAMA flag as an environment variable. [#4323](https://github.com/TabbyML/tabby/pull/4323)

CHANGELOG.md

@@ -5,6 +5,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
+## v0.30.2 (2025-07-31)
+
+### Notice
+
+* This is a patch release, please also check [the full release note](https://github.com/TabbyML/tabby/releases/tag/v0.30.0) for 0.30.
+
+### Fixed and Improvements
+
+* Use 0.7.3 sqlx to avoid database pool timeout. [#4328](https://github.com/TabbyML/tabby/pull/4328)
+* Bump llama.cpp to b6047. [#4330](https://github.com/TabbyML/tabby/pull/4330)
+* Expose the Flash Attention LLAMA flag as an environment variable. [#4323](https://github.com/TabbyML/tabby/pull/4323)
+
 ## v0.30.1 (2025-07-16)
 
 ### Notice

ee/tabby-db/migrations/0048_add-branding-column.down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE server_setting DROP COLUMN branding_logo;
+ALTER TABLE server_setting DROP COLUMN branding_icon;

ee/tabby-db/migrations/0048_add-branding-column.up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE server_setting ADD COLUMN branding_logo TEXT DEFAULT NULL;
+ALTER TABLE server_setting ADD COLUMN branding_icon TEXT DEFAULT NULL;

ee/tabby-db/migrations/0048_add-oauth-config-url.down.sql renamed to ee/tabby-db/migrations/0049_add-oauth-config-url.down.sql

@@ -64,7 +64,9 @@ CREATE TABLE server_setting(
   network_external_url STRING NOT NULL DEFAULT 'http://localhost:8080'
   ,
   billing_enterprise_license STRING,
-  security_disable_password_login BOOLEAN NOT NULL DEFAULT FALSE
+  security_disable_password_login BOOLEAN NOT NULL DEFAULT FALSE,
+  branding_logo TEXT DEFAULT NULL,
+  branding_icon TEXT DEFAULT NULL
 );
 CREATE TABLE email_setting(
   id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -259,27 +261,29 @@ CREATE TABLE ldap_credential(
   created_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now')),
   updated_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now'))
 );
-CREATE TABLE IF NOT EXISTS "pages"(
-  id integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-  author_id integer NOT NULL,
-  title text,
-  content text,
-  created_at timestamp NOT NULL DEFAULT(DATETIME('now')),
-  updated_at timestamp NOT NULL DEFAULT(DATETIME('now')),
+CREATE TABLE pages(
+  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  -- The user who created the page
+  author_id INTEGER NOT NULL,
+  title TEXT,
+  content TEXT,
+  created_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now')),
+  updated_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now')),
   code_source_id VARCHAR(255),
-  FOREIGN KEY(author_id) REFERENCES "users"(id) ON DELETE CASCADE
+  FOREIGN KEY(author_id) REFERENCES users(id) ON DELETE CASCADE
 );
-CREATE TABLE IF NOT EXISTS "page_sections"(
-  id integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-  page_id integer NOT NULL,
-  title text NOT NULL,
-  content text,
-  "position" integer NOT NULL,
-  created_at timestamp NOT NULL DEFAULT(DATETIME('now')),
-  updated_at timestamp NOT NULL DEFAULT(DATETIME('now')),
+CREATE TABLE page_sections(
+  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  page_id INTEGER NOT NULL,
+  title TEXT NOT NULL,
+  content TEXT,
+  position INTEGER NOT NULL,
+  created_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now')),
+  updated_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now')),
   attachment BLOB NOT NULL DEFAULT '{}',
-  FOREIGN KEY(page_id) REFERENCES "pages"(id) ON DELETE CASCADE,
-  UNIQUE(page_id, "position")
+  --- Ensure that the position is unique for each page
+  CONSTRAINT `unique_page_id_position` UNIQUE(page_id, position),
+  FOREIGN KEY(page_id) REFERENCES pages(id) ON DELETE CASCADE
 );
 CREATE TABLE ingested_documents(
   id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,

ee/tabby-db/migrations/0048_add-oauth-config-url.up.sql renamed to ee/tabby-db/migrations/0049_add-oauth-config-url.up.sql

@@ -10,6 +10,8 @@ pub struct ServerSettingDAO {
     pub security_disable_client_side_telemetry: bool,
     pub security_disable_password_login: bool,
     pub network_external_url: String,
+    pub branding_logo: Option<String>,
+    pub branding_icon: Option<String>,
 }
 
 const SERVER_SETTING_ROW_ID: i32 = 1;
@@ -35,7 +37,9 @@ impl DbConn {
                 network_external_url,
                 security_allowed_register_domain_list,
                 billing_enterprise_license,
-                security_disable_password_login
+                security_disable_password_login,
+                branding_logo,
+                branding_icon
             FROM server_setting
             WHERE id = ?;",
         )
@@ -106,6 +110,23 @@ impl DbConn {
         Ok(())
     }
 
+    pub async fn update_branding_setting(
+        &self,
+        branding_logo: Option<String>,
+        branding_icon: Option<String>,
+    ) -> Result<()> {
+        sqlx::query!(
+            "UPDATE server_setting SET branding_logo = ?, branding_icon = ? WHERE id = ?",
+            branding_logo,
+            branding_icon,
+            SERVER_SETTING_ROW_ID
+        )
+        .execute(&self.pool)
+        .await?;
+
+        Ok(())
+    }
+
     pub async fn read_enterprise_license(&self) -> Result<Option<String>> {
         Ok(sqlx::query_scalar(
             "SELECT billing_enterprise_license FROM server_setting WHERE id = ?;",
@@ -142,6 +163,8 @@ mod tests {
             security_disable_client_side_telemetry: false,
             security_disable_password_login: false,
             network_external_url: "http://localhost:8080".into(),
+            branding_logo: None,
+            branding_icon: None,
         }
     }
     #[test]