🌐 AI搜索 & 代理 主页
Skip to content

Montana/norly #1194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
montanalow merged 4 commits into from
Nov 28, 2023
Merged

Montana/norly #1194

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6e33e9
ya rly
montanalow Nov 28, 2023
9452699
env! is not env::var!
montanalow Nov 28, 2023
3cd0909
remove dead code
montanalow Nov 28, 2023
35fe5a6
cargo fmt
montanalow Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
ya rly
  • Loading branch information
@montanalow
montanalow committed Nov 28, 2023
commit d6e33e966c4966871aa40b770d83dc7390778169
1 change: 0 additions & 1 deletion pgml-dashboard/src/components/navigation/tabs/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ pub mod tab;
pub use tab::Tab;

// src/components/navigation/tabs/tabs
#[allow(clippy::module_inception)]
pub mod tabs;
pub use tabs::Tabs;
6 changes: 3 additions & 3 deletions pgml-dashboard/src/utils/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct Config {
deployment: String,
dev_mode: bool,
database_url: String,
git_sha: String,
git_sha: Option<String>,
github_stars: String,
sentry_dsn: Option<String>,
signup_url: String,
Expand Down Expand Up @@ -66,7 +66,7 @@ impl Config {
Config {
dev_mode,
database_url: env_string_default("DATABASE_URL", "postgres:///pgml"),
git_sha: env_string_required("GIT_SHA"),
git_sha: env_string_optional("GIT_SHA"),
sentry_dsn: env_string_optional("SENTRY_DSN"),
static_dir: env_path_default("DASHBOARD_STATIC_DIRECTORY", "static"),
cms_dir: env_path_default("DASHBOARD_CMS_DIRECTORY", "../pgml-cms"),
Expand All @@ -92,7 +92,7 @@ pub fn database_url<'a>() -> &'a str {
&CONFIG.database_url
}

pub fn git_sha<'a>() -> &'a str {
pub fn git_sha<'a>() -> &'a Option<String> {
&CONFIG.git_sha
}

Expand Down