Merge branch 'dev' into documentation/markdown-lint

opf · Apr 29, 2024 · 71c9506 · 71c9506
2 parents 1b63e44 + be6bfcd
commit 71c9506
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 43 deletions.
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2.3'
+          ruby-version: '3.3.1'
       - uses: MeilCli/danger-action@v5
         with:
           danger_file: 'Dangerfile'

diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
@@ -44,9 +44,9 @@ jobs:
       uses: runs-on/cache@v4
       with:
         path: cache/bundle
-        key: gem-${{ hashFiles('Gemfile.lock') }}
+        key: gem-${{ hashFiles('.ruby-version') }}-${{ hashFiles('Gemfile.lock') }}
         restore-keys: |
-          gem-
+          gem-${{ hashFiles('.ruby-version') }}-
     - name: Cache NPM
       uses: runs-on/cache@v4
       with:

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -22,7 +22,7 @@ inherit_mode:
     - Exclude
 
 AllCops:
-  TargetRubyVersion: 3.2
+  TargetRubyVersion: 3.3
   # Enable any new cops in new versions by default
   NewCops: enable
   Exclude:

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.2.3
+3.3.1
diff --git a/Gemfile b/Gemfile
@@ -115,6 +115,8 @@ gem "ruby-duration", "~> 3.2.0"
 # released.
 gem "mail", "= 2.8.1"
 
+gem "csv", "~> 3.3"
+
 # provide compatible filesystem information for available storage
 gem "sys-filesystem", "~> 1.4.0", require: false
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -436,6 +436,7 @@ GEM
     crass (1.0.6)
     css_parser (1.17.1)
       addressable
+    csv (3.3.0)
     cuprite (0.15)
       capybara (~> 3.0)
       ferrum (~> 0.14.0)
@@ -1191,6 +1192,7 @@ DEPENDENCIES
   commonmarker (~> 1.0.3)
   compare-xml (~> 0.66)
   costs!
+  csv (~> 3.3)
   cuprite (~> 0.15.0)
   daemons
   dalli (~> 3.2.0)
@@ -1357,7 +1359,7 @@ DEPENDENCIES
   with_advisory_lock (~> 5.1.0)
 
 RUBY VERSION
-   ruby 3.2.3p157
+   ruby 3.3.1p55
 
 BUNDLED WITH
-   2.5.5
+   2.5.9
diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile
@@ -3,7 +3,7 @@ ARG RUBY_VERSION
 FROM ruby:${RUBY_VERSION}-bullseye
 
 ENV NODE_VERSION="20.9.0"
-ENV BUNDLER_VERSION="2.5.5"
+ENV BUNDLER_VERSION="2.5.9"
 ENV DEBIAN_FRONTEND=noninteractive
 ENV BUNDLE_WITHOUT="development:production:docker"
 

diff --git a/docker/dev/backend/Dockerfile b/docker/dev/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.2.3-bullseye as develop
+FROM ruby:3.3.1-bullseye as develop
 MAINTAINER [email protected]
 
 ARG DEV_UID=1000
@@ -8,7 +8,7 @@ ENV USER=dev
 ENV RAILS_ENV=development
 ENV NODE_MAJOR=20
 
-ENV BUNDLER_VERSION "2.5.5"
+ENV BUNDLER_VERSION "2.5.9"
 
 # `--no-log-init` is required as a workaround to avoid disk exhaustion.
 #

diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
@@ -1,6 +1,6 @@
-ARG RUBY_VERSION="3.2.3"
+ARG RUBY_VERSION="3.3.1"
 ARG NODE_VERSION="20.9.0"
-ARG BUNDLER_VERSION="2.5.5"
+ARG BUNDLER_VERSION="2.5.9"
 ARG DEBIAN_FRONTEND=noninteractive
 
 # -------------------------------------
@@ -166,9 +166,9 @@ COPY docker/prod/setup ./docker/prod/setup
 RUN ./docker/prod/setup/preinstall.sh
 
 RUN dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
- && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \
- && chmod +x /usr/local/bin/gosu \
- && gosu nobody true
+  && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \
+  && chmod +x /usr/local/bin/gosu \
+  && gosu nobody true
 
 # set irb default config for app (docker run -it ...) and root (docker exec -it ...) users
 RUN ln -s /app/docker/prod/setup/.irbrc /home/$APP_USER/

diff --git a/docs/development/development-environment-osx/README.md b/docs/development/development-environment-osx/README.md
@@ -27,7 +27,7 @@ their homepage.
 Use [rbenv](https://github.com/rbenv/rbenv) and [ruby-build](https://github.com/rbenv/ruby-build#readme) to install
 Ruby. We always require the latest ruby versions, and you can check which version is required
 by [checking the Gemfile](https://github.com/opf/openproject/blob/dev/Gemfile#L31) for the `ruby "~> X.Y"` statement. At
-the time of writing, this version is "3.2.3"
+the time of writing, this version is "3.3.1"
 
 #### Install rbenv and ruby-build
 
@@ -45,22 +45,22 @@ $ rbenv init
 
 With both installed, we can now install the actual ruby version. You can check available ruby versions
 with `rbenv install --list`.
-At the time of this writing, the latest stable version is `3.2.3`, which we also require.
+At the time of this writing, the latest stable version is `3.3.1`, which we also require.
 
 We suggest you install the version we require in the [Gemfile](https://github.com/opf/openproject/blob/dev/Gemfile).
 Search for the `ruby '~> X.Y.Z'` line
 and install that version.
 
 ```shell
 # Install the required version as read from the Gemfile
-rbenv install 3.2.3
+rbenv install 3.3.1
 ```
 
 This might take a while depending on whether ruby is built from source. After it is complete, you need to tell rbenv to
 globally activate this version
 
 ```shell
-rbenv global 3.2.3
+rbenv global 3.3.1
 ```
 
 You also need to install [bundler](https://github.com/bundler/bundler/), the ruby gem bundler.
@@ -134,10 +134,10 @@ You should now have an active ruby and node installation. Verify that it works w
 
 ```shell
 $ ruby --version
-ruby 3.2.3 (2024-01-18 revision 52bb2ac0a6) [arm64-darwin23]
+ruby 3.3.1 (2024-04-23 revision c56cd86388) [arm64-darwin23]
 
 $ bundler --version
-Bundler version 2.5.5
+Bundler version 2.5.9
 
 node --version
 v20.9.0

diff --git a/docs/development/development-environment-ubuntu/README.md b/docs/development/development-environment-ubuntu/README.md
@@ -41,7 +41,7 @@ sudo apt-get install git curl build-essential zlib1g-dev libyaml-dev libssl-dev
 Use [rbenv](https://github.com/rbenv/rbenv) and [ruby-build](https://github.com/rbenv/ruby-build#readme) to install
 Ruby. We always require the latest ruby versions, and you can check which version is required
 by [checking the Gemfile](https://github.com/opf/openproject/blob/dev/Gemfile#L31) for the `ruby "~> X.Y"` statement. At
-the time of writing, this version is "3.2.3"
+the time of writing, this version is "3.3.1"
 
 #### Install rbenv and ruby-build
 
@@ -75,22 +75,22 @@ git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
 #### Installing ruby
 
 With both installed, we can now install ruby. You can check available ruby versions with `rbenv install --list`.
-At the time of this writing, the latest stable version is `3.2.3` which we also require.
+At the time of this writing, the latest stable version is `3.3.1` which we also require.
 
 We suggest you install the version we require in the [Gemfile](https://github.com/opf/openproject/blob/dev/Gemfile).
 Search for the `ruby '~> X.Y.Z'` line
 and install that version.
 
 ```shell
 # Install the required version as read from the Gemfile
-rbenv install 3.2.3
+rbenv install 3.3.1
 ```
 
 This might take a while depending on whether ruby is built from source. After it is complete, you need to tell rbenv to
 globally activate this version
 
 ```shell
-rbenv global 3.2.3
+rbenv global 3.3.1
 rbenv rehash
 ```
 
@@ -180,10 +180,10 @@ You should now have an active ruby and node installation. Verify that it works w
 
 ```shell
 ruby --version
-ruby 3.2.3 (2024-01-18 revision 52bb2ac0a6) [arm64-darwin23]
+ruby 3.3.1 (2024-04-23 revision c56cd86388) [arm64-darwin23]
 
 bundler --version
-Bundler version 2.5.5
+Bundler version 2.5.9
 
 node --version
 v20.9.0

diff --git a/docs/installation-and-operations/installation/manual/README.md b/docs/installation-and-operations/installation/manual/README.md
@@ -108,16 +108,16 @@ time to finish.
 [openproject@host] source ~/.profile
 [openproject@host] git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build
 
-[openproject@host] rbenv install 3.2.3
+[openproject@host] rbenv install 3.3.1
 [openproject@host] rbenv rehash
-[openproject@host] rbenv global 3.2.3
+[openproject@host] rbenv global 3.3.1
 ```
 
 To check our Ruby installation we run `ruby --version`. It should output
 something very similar to:
 
 ```text
-ruby 3.2.3 (2024-01-18 revision 52bb2ac0a6) [arm64-darwin23]
+ruby 3.3.1 (2024-04-23 revision c56cd86388) [arm64-darwin23]
 ```
 
 ## Installation of Node

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/script/github_pr_errors b/script/github_pr_errors
@@ -283,7 +283,7 @@ end
 
 # rubocop:disable Layout/LineLength
 # Looks like this in the job log:
-# Process 28: TEST_ENV_NUMBER=28 RUBYOPT=-I/usr/local/bundle/bundler/gems/turbo_tests-3148ae6c3482/lib -r/usr/local/bundle/gems/bundler-2.5.5/lib/bundler/setup -W0 RSPEC_SILENCE_FILTER_ANNOUNCEMENTS=1 /usr/local/bundle/gems/bundler-2.5.5/exe/bundle exec rspec --seed 52674 --format TurboTests::JsonRowsFormatter --out tmp/test-pipes/subprocess-28 --format ParallelTests::RSpec::RuntimeLogger --out spec/support/turbo_runtime_features.log spec/features/api_docs/index_spec.rb spec/features/custom_fields/reorder_options_spec.rb spec/features/projects/projects_portfolio_spec.rb spec/features/projects/template_spec.rb spec/features/versions/edit_spec.rb spec/features/work_packages/details/markdown/description_editor_spec.rb spec/features/work_packages/table/hierarchy/hierarchy_parent_below_spec.rb spec/features/work_packages/table/inline_create/inline_create_refresh_spec.rb spec/features/work_packages/table/invalid_query_spec.rb spec/features/work_packages/tabs/activity_revisions_spec.rb
+# Process 28: TEST_ENV_NUMBER=28 RUBYOPT=-I/usr/local/bundle/bundler/gems/turbo_tests-3148ae6c3482/lib -r/usr/local/bundle/gems/bundler-2.5.9/lib/bundler/setup -W0 RSPEC_SILENCE_FILTER_ANNOUNCEMENTS=1 /usr/local/bundle/gems/bundler-2.5.9/exe/bundle exec rspec --seed 52674 --format TurboTests::JsonRowsFormatter --out tmp/test-pipes/subprocess-28 --format ParallelTests::RSpec::RuntimeLogger --out spec/support/turbo_runtime_features.log spec/features/api_docs/index_spec.rb spec/features/custom_fields/reorder_options_spec.rb spec/features/projects/projects_portfolio_spec.rb spec/features/projects/template_spec.rb spec/features/versions/edit_spec.rb spec/features/work_packages/details/markdown/description_editor_spec.rb spec/features/work_packages/table/hierarchy/hierarchy_parent_below_spec.rb spec/features/work_packages/table/inline_create/inline_create_refresh_spec.rb spec/features/work_packages/table/invalid_query_spec.rb spec/features/work_packages/tabs/activity_revisions_spec.rb
 # rubocop:enable Layout/LineLength
 class TestsGroup
   attr_accessor :test_env_number, :seed, :files