Skip to content

[bot] Merge 24.11 to 25.1 #128

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
github-actions merged 2 commits into from
Jan 7, 2025
Merged

[bot] Merge 24.11 to 25.1 #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5f1bc0
remove FileLinkMetrics.EnableFileLinkMetricsTask; bump to v24.11 (#126)
labkey-willm Jan 6, 2025
da5a3bd
Merge 24.11 to 25.1
labkey-teamcity Jan 7, 2025
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
2 changes: 1 addition & 1 deletion quickstart_envs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# example minimal set of environment variables to get started - see readme for additional envs you may wish to set

# embedded tomcat LabKey .jar version to build container with
export LABKEY_VERSION="24.6"
export LABKEY_VERSION="24.11"

# minimal SMTP settings
export SMTP_HOST="localhost"
Expand Down
1 change: 0 additions & 1 deletion startup/basic.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ SiteSettings.pipelineToolsDirectory;bootstrap=${LABKEY_HOME}

SiteSettings.sslPort;startup=${LABKEY_PORT}
SiteSettings.sslRequired;startup=true
FileLinkMetrics.EnableFileLinkMetricsTask;startup=true

SearchSettings.indexFilePath;bootstrap=${LABKEY_FILES_ROOT}/labkey_full_text_index
SiteSettings.readOnlyHttpRequestTimeout;startup=605
Expand Down
Loading