diff --git a/Gemfile b/Gemfile index 33d8ee74211..ccbbb3d60e4 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem 'actionpack-xml_parser', '~> 2.0.0' gem 'activemodel-serializers-xml', '~> 1.0.1' gem 'activerecord-import', '~> 1.4.0' gem 'activerecord-session_store', '~> 2.0.0' -gem 'rails', '~> 7.0.3' +gem 'rails', '~> 7.0', '>= 7.0.3.1' gem 'responders', '~> 3.0' gem 'ffi', '~> 1.15' diff --git a/Gemfile.lock b/Gemfile.lock index 4fd6a91a947..d35fb1a810b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -188,34 +188,34 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actioncable (7.0.3) - actionpack (= 7.0.3) - activesupport (= 7.0.3) + actioncable (7.0.3.1) + actionpack (= 7.0.3.1) + activesupport (= 7.0.3.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.3) - actionpack (= 7.0.3) - activejob (= 7.0.3) - activerecord (= 7.0.3) - activestorage (= 7.0.3) - activesupport (= 7.0.3) + actionmailbox (7.0.3.1) + actionpack (= 7.0.3.1) + activejob (= 7.0.3.1) + activerecord (= 7.0.3.1) + activestorage (= 7.0.3.1) + activesupport (= 7.0.3.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.3) - actionpack (= 7.0.3) - actionview (= 7.0.3) - activejob (= 7.0.3) - activesupport (= 7.0.3) + actionmailer (7.0.3.1) + actionpack (= 7.0.3.1) + actionview (= 7.0.3.1) + activejob (= 7.0.3.1) + activesupport (= 7.0.3.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.3) - actionview (= 7.0.3) - activesupport (= 7.0.3) + actionpack (7.0.3.1) + actionview (= 7.0.3.1) + activesupport (= 7.0.3.1) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -223,31 +223,31 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actiontext (7.0.3) - actionpack (= 7.0.3) - activerecord (= 7.0.3) - activestorage (= 7.0.3) - activesupport (= 7.0.3) + actiontext (7.0.3.1) + actionpack (= 7.0.3.1) + activerecord (= 7.0.3.1) + activestorage (= 7.0.3.1) + activesupport (= 7.0.3.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.3) - activesupport (= 7.0.3) + actionview (7.0.3.1) + activesupport (= 7.0.3.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.3) - activesupport (= 7.0.3) + activejob (7.0.3.1) + activesupport (= 7.0.3.1) globalid (>= 0.3.6) - activemodel (7.0.3) - activesupport (= 7.0.3) + activemodel (7.0.3.1) + activesupport (= 7.0.3.1) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (7.0.3) - activemodel (= 7.0.3) - activesupport (= 7.0.3) + activerecord (7.0.3.1) + activemodel (= 7.0.3.1) + activesupport (= 7.0.3.1) activerecord-import (1.4.0) activerecord (>= 4.2) activerecord-nulldb-adapter (0.8.0) @@ -258,14 +258,14 @@ GEM multi_json (~> 1.11, >= 1.11.2) rack (>= 2.0.8, < 3) railties (>= 5.2.4.1) - activestorage (7.0.3) - actionpack (= 7.0.3) - activejob (= 7.0.3) - activerecord (= 7.0.3) - activesupport (= 7.0.3) + activestorage (7.0.3.1) + actionpack (= 7.0.3.1) + activejob (= 7.0.3.1) + activerecord (= 7.0.3.1) + activesupport (= 7.0.3.1) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.3) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -562,7 +562,7 @@ GEM domain_name (~> 0.5) http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) i18n-js (3.9.2) i18n (>= 0.6.6) @@ -659,7 +659,7 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.13.6) + nokogiri (1.13.7) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.25.1) @@ -769,20 +769,20 @@ GEM rack_session_access (0.2.0) builder (>= 2.0.0) rack (>= 1.0.0) - rails (7.0.3) - actioncable (= 7.0.3) - actionmailbox (= 7.0.3) - actionmailer (= 7.0.3) - actionpack (= 7.0.3) - actiontext (= 7.0.3) - actionview (= 7.0.3) - activejob (= 7.0.3) - activemodel (= 7.0.3) - activerecord (= 7.0.3) - activestorage (= 7.0.3) - activesupport (= 7.0.3) + rails (7.0.3.1) + actioncable (= 7.0.3.1) + actionmailbox (= 7.0.3.1) + actionmailer (= 7.0.3.1) + actionpack (= 7.0.3.1) + actiontext (= 7.0.3.1) + actionview (= 7.0.3.1) + activejob (= 7.0.3.1) + activemodel (= 7.0.3.1) + activerecord (= 7.0.3.1) + activestorage (= 7.0.3.1) + activesupport (= 7.0.3.1) bundler (>= 1.15.0) - railties (= 7.0.3) + railties (= 7.0.3.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -795,9 +795,9 @@ GEM rails-i18n (7.0.5) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.3) - actionpack (= 7.0.3) - activesupport (= 7.0.3) + railties (7.0.3.1) + actionpack (= 7.0.3.1) + activesupport (= 7.0.3.1) method_source rake (>= 12.2) thor (~> 1.0) @@ -1136,7 +1136,7 @@ DEPENDENCIES rack-test (~> 2.0.0) rack-timeout (~> 0.6.0) rack_session_access - rails (~> 7.0.3) + rails (~> 7.0, >= 7.0.3.1) rails-controller-testing (~> 1.0.2) rails-i18n (~> 7.0.0) rdoc (>= 2.4.2) diff --git a/config/application.rb b/config/application.rb index 057159940f2..98d1b6c1cc9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -115,6 +115,9 @@ module OpenProject # Fall back to default locale config.i18n.fallbacks = true + # Enable serialization of types [Symbol, Date, Time] + config.active_record.yaml_column_permitted_classes = [Symbol, Date, Time, ActiveSupport::HashWithIndifferentAccess] + # Activate being able to specify the format in which full_message works. # Doing this, it is e.g. possible to avoid having the format of '%{attribute} %{message}' which # will always prepend the attribute name to the error message. diff --git a/docs/installation-and-operations/installation/docker/README.md b/docs/installation-and-operations/installation/docker/README.md index c97ffd4f9c4..b7d66043666 100644 --- a/docs/installation-and-operations/installation/docker/README.md +++ b/docs/installation-and-operations/installation/docker/README.md @@ -52,18 +52,24 @@ After a while, OpenProject should be up and running on `http://localhost:8080`. Note that the `docker-compose.yml` file present in the repository can be adjusted to your convenience. For instance you could mount specific configuration files, override environment variables, or switch off services you don't need. Please refer to the official [Docker Compose documentation](https://docs.docker.com/compose/extends/) for more details. -You can stop the Compose stack and keep your data by running: +You can stop the Compose stack by running: ``` docker-compose stop ``` -You can stop and remove the Compose stack which removes ALL your data by running: +You can stop and remove all containers by running: ``` docker-compose down ``` +This will not remove your data which is persisted in named volumes, likely called `compose_opdata` (for attachments) and `compose_pgdata` (for the database). The exact name depends on the name of the directory where +your `docker-compose.yml` file is stored (`compose` in this case). + +If you want to start from scratch and remove the exsiting data you will have to remove these volumes via +`docker volume rm compose_opdata compose_pgdata`. + ## All-in-one container ### Quick Start diff --git a/docs/installation-and-operations/installation/packaged/README.md b/docs/installation-and-operations/installation/packaged/README.md index f487cc8c71f..5bf6ccd8984 100644 --- a/docs/installation-and-operations/installation/packaged/README.md +++ b/docs/installation-and-operations/installation/packaged/README.md @@ -254,7 +254,14 @@ wget -O /etc/zypp/repos.d/openproject.repo \ https://dl.packager.io/srv/opf/openproject/stable/12/installer/sles/12.repo ``` -Download the OpenProject package: +If you already had an old package source that is being updated you must refresh +your source next. It can't hurt to do this in any case, though. + +```bash +sudo zypper refresh openproject +``` + +Next, download the OpenProject package: ```bash sudo zypper install openproject diff --git a/docs/installation-and-operations/operation/upgrading/README.md b/docs/installation-and-operations/operation/upgrading/README.md index 33753b37368..adf95058f8f 100644 --- a/docs/installation-and-operations/operation/upgrading/README.md +++ b/docs/installation-and-operations/operation/upgrading/README.md @@ -44,6 +44,7 @@ sudo openproject configure ### SuSE ```bash +sudo zypper refresh openproject sudo zypper update openproject sudo openproject configure ``` diff --git a/docs/release-notes/12-1-6/README.md b/docs/release-notes/12-1-6/README.md new file mode 100644 index 00000000000..358a64a02bd --- /dev/null +++ b/docs/release-notes/12-1-6/README.md @@ -0,0 +1,33 @@ +--- +title: OpenProject 12.1.6 +sidebar_navigation: + title: 12.1.6 +release_version: 12.1.6 +release_date: 2022-07-12 +--- + +# OpenProject 12.1.6 + +Release date: 2022-07-12 + +We released [OpenProject 12.1.6](https://community.openproject.com/versions/1586). +The release contains several bug fixes and we recommend updating to the newest version. + + +#### Bug fixes and changes + +- Fixed: EE Trial creation not possible from form configuration \[[#42806](https://community.openproject.com/wp/42806)\] +- Fixed: Deleting a user only locks the user \[[#42882](https://community.openproject.com/wp/42882)\] +- Fixed: Filtering of work packages does not work any longer by ID \[[#42883](https://community.openproject.com/wp/42883)\] +- Fixed: Danger zone: Spaces are collapsed into one in the expected value \[[#42886](https://community.openproject.com/wp/42886)\] +- Fixed: Session authentication with warden not triggered \[[#42949](https://community.openproject.com/wp/42949)\] +- Fixed: Invalid SMTP configuration breaks project copy \[[#42962](https://community.openproject.com/wp/42962)\] +- Fixed: Include projects mistake \[[#43034](https://community.openproject.com/wp/43034)\] +- Fixed: dots of Ü are missing in notification list \[[#43086](https://community.openproject.com/wp/43086)\] + +#### Contributions +A big thanks to community members for reporting bugs and helping us identifying and providing fixes. + +Special thanks for reporting and finding bugs go to + +Christina Vechkanova, Sven Kunze diff --git a/docs/release-notes/README.md b/docs/release-notes/README.md index 1465945c275..d19319473a1 100644 --- a/docs/release-notes/README.md +++ b/docs/release-notes/README.md @@ -14,6 +14,13 @@ Stay up to date and get an overview of the new features included in the releases +## 12.1.6 + +Release date: 2022-07-12 + +[Release Notes](12-1-6/) + + ## 12.1.5 Release date: 2022-06-08 diff --git a/lib/open_project/patches/i18n_reject_empty_string.rb b/lib/open_project/patches/i18n_reject_empty_string.rb index 756f4f36056..e1b756900f1 100644 --- a/lib/open_project/patches/i18n_reject_empty_string.rb +++ b/lib/open_project/patches/i18n_reject_empty_string.rb @@ -60,6 +60,6 @@ module OpenProject end end -OpenProject::Patches.patch_gem_version 'i18n', '1.10.0' do +OpenProject::Patches.patch_gem_version 'i18n', '1.12.0' do I18n.backend.singleton_class.prepend OpenProject::Patches::I18nRejectEmptyString end