Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/14.0' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverguenther committed May 8, 2024
2 parents 0e6139c + b8789b1 commit 1090e2d
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 10 deletions.
8 changes: 2 additions & 6 deletions docker/prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ RUN ./docker/prod/setup/preinstall-common.sh
# stuff required for gems
COPY Gemfile Gemfile.* .ruby-version ./
COPY modules ./modules
# Add vendor for saas-openproject plugins
COPY vendor ./vendor
# some gemspec files of plugins require files in there, notably OpenProject::Version
# Add lib in case a plugin tries to load VERSION file under lib
COPY lib ./lib

RUN \
Expand All @@ -74,11 +75,6 @@ RUN cp Gemfile.lock.bak Gemfile.lock && rm Gemfile.lock.bak
RUN ./docker/prod/setup/precompile-assets.sh
RUN ./docker/prod/setup/postinstall-common.sh

# We need this so puma is allowed to create the tmp/pids folder and
# temporary upload files when running with a uid other than 1000 (app)
# but with an allowed supplemental group (1000).
RUN tmp_path=$APP_PATH/tmp; (mkdir -p $tmp_path || true) && chown $APP_USER:$APP_USER $tmp_path && chmod g+rw $tmp_path

RUN cp ./config/database.production.yml config/database.yml
RUN ln -s $APP_PATH/docker/prod/setup/.irbrc /home/$APP_USER/

Expand Down
13 changes: 12 additions & 1 deletion docker/prod/setup/postinstall-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,15 @@ set -eox pipefail
mkdir -p /tmp/op_uploaded_files/ && chown -R $APP_USER:$APP_USER /tmp/op_uploaded_files/

# Remove any existing config/database.yml
rm -f ./config/database.yml
rm -f ./config/database.yml

# We need this so puma is allowed to create the tmp/pids folder and
# temporary upload files when running with a uid other than 1000 (app)
# but with an allowed supplemental group (1000).
tmp_path="$APP_PATH/tmp"
# Remove any previously cached files from e.g., asset building
rm -rf "$tmp_path"
# Recreate and own it for the user for later files (PID etc. see above)
mkdir -p "$tmp_path"
chown -R $APP_USER:$APP_USER "$tmp_path"
chmod g+rw "$tmp_path"
30 changes: 30 additions & 0 deletions docs/release-notes/14-0-1/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
title: OpenProject 14.0.1
sidebar_navigation:
title: 14.0.1
release_version: 14.0.1
release_date: 2024-05-08
---

# OpenProject 14.0.1

Release date: 2024-05-08

We released [OpenProject 14.0.1](https://community.openproject.org/versions/2039).
The release contains several bug fixes and we recommend updating to the newest version.

<!--more-->

## Bug fixes and changes

<!-- Warning: Anything within the below lines will be automatically removed by the release script -->
<!-- BEGIN AUTOMATED SECTION -->

- Bugfix: uninitialized constant CostQuery::Filter::CustomField \[[#54500](https://community.openproject.org/wp/54500)\]
- Bugfix: openDesk setup script fails \[[#54558](https://community.openproject.org/wp/54558)\]
- Bugfix: Totals of non-parent work packages are updated when status is changed in administration \[[#54646](https://community.openproject.org/wp/54646)\]
- Bugfix: User receives email updates even if their account is permanently locked \[[#54714](https://community.openproject.org/wp/54714)\]
- Feature: Snappier progress popover \[[#54464](https://community.openproject.org/wp/54464)\]

<!-- END AUTOMATED SECTION -->
<!-- Warning: Anything above this line will be automatically removed by the release script -->
7 changes: 7 additions & 0 deletions docs/release-notes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ Stay up to date and get an overview of the new features included in the releases
<!--- New release notes are generated below. Do not remove comment. -->
<!--- RELEASE MARKER -->

## 14.0.1

Release date: 2024-05-08

[Release Notes](14-0-1/)


## 14.0.0

Release date: 2024-04-24
Expand Down
6 changes: 3 additions & 3 deletions modules/ldap_groups/lib/open_project/ldap_groups/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ class Engine < ::Rails::Engine

add_cron_jobs do
{
"Ldap::SynchronizationJob": {
cron: "30 23 * * *", # Run once per night at 11:30pm
class: Ldap::SynchronizationJob.name
"LdapGroups::SynchronizationJob": {
cron: "*/30 * * * *", # Run every 30 minutes
class: LdapGroups::SynchronizationJob.name
}
}
end
Expand Down

0 comments on commit 1090e2d

Please sign in to comment.