Merge branch 'dev' into feature/49684-upload-custom-picture-for-cover…

…-page-of-pdf-export

.editorconfig

@@ -343,7 +343,7 @@ ij_json_keep_indents_on_empty_lines = false
 ij_json_keep_line_breaks = true
 ij_json_space_after_colon = true
 ij_json_space_after_comma = true
-ij_json_space_before_colon = true
+ij_json_space_before_colon = false
 ij_json_space_before_comma = false
 ij_json_spaces_within_braces = false
 ij_json_spaces_within_brackets = false

.env.test.local.example

@@ -0,0 +1,37 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2020 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+NEXTCLOUD_LOCAL_OAUTH_CLIENT_ID=
+NEXTCLOUD_LOCAL_OAUTH_CLIENT_SECRET=
+
+NEXTCLOUD_LOCAL_OPENPROJECT_UID=
+NEXTCLOUD_LOCAL_OPENPROJECT_SECRET=
+NEXTCLOUD_LOCAL_OPENPROJECT_REDIRECT_URI=https://nextcloud.local/index.php/apps/integration_openproject/oauth-redirect
+
+NEXTCLOUD_LOCAL_OAUTH_CLIENT_ACCESS_TOKEN=
+NEXTCLOUD_LOCAL_OAUTH_CLIENT_REFRESH_TOKEN=

.erb-lint.yml

@@ -0,0 +1,35 @@
+---
+EnableDefaultLinters: true
+inherit_gem:
+  erblint-github:
+    - config/accessibility.yml
+exclude:
+  - '**/frontend/**/*'
+  - '**/node_modules/**/*'
+  - '**/vendor/**/*'
+linters:
+  ErbSafety:
+    enabled: true
+  Rubocop:
+    enabled: true
+    rubocop_config:
+      inherit_from:
+        - .rubocop.yml
+      Layout/InitialIndentation:
+        Enabled: false
+      Layout/LeadingEmptyLines:
+        Enabled: false
+      Layout/LineLength:
+        Enabled: false
+      Layout/TrailingEmptyLines:
+        Enabled: false
+      Layout/TrailingWhitespace:
+        Enabled: false
+      Naming/FileName:
+        Enabled: false
+      Style/FrozenStringLiteralComment:
+        Enabled: false
+      Lint/UselessAssignment:
+        Enabled: false
+      Rails/OutputSafety:
+        Enabled: false

.erb-linters/erblint-github.rb

@@ -0,0 +1 @@
+require "erblint-github/linters"

.github/workflows/pullpreview.yml

@@ -44,7 +44,7 @@ jobs:
         cp ./docker/pullpreview-storybook/Dockerfile ./Dockerfile-storybook
     - uses: pullpreview/action@v5
       with:
-        admins: crohr,HDinger,machisuji,oliverguenther,ulferts,wielinde,b12f,cbliard
+        admins: crohr,HDinger,machisuji,oliverguenther,ulferts,wielinde,cbliard
         compose_files: docker-compose.pullpreview.yml
         instance_type: large
         ports: 80,443,8080

.rubocop.yml

@@ -1,6 +1,7 @@
 require:
   - rubocop-rails
   - rubocop-rspec
+  - ./lib_static/rubocop/cop/open_project/add_preview_for_view_component.rb
   - ./lib_static/rubocop/cop/open_project/no_do_end_block_with_rspec_capybara_matcher_in_expect.rb
   - ./lib_static/rubocop/cop/open_project/use_service_result_factory_methods.rb
   - rubocop-capybara

Gemfile

@@ -91,7 +91,7 @@ gem 'escape_utils', '~> 1.3'
 # Syntax highlighting used in html-pipeline with rouge
 gem 'rouge', '~> 4.1.0'
 # HTML sanitization used for html-pipeline
-gem 'sanitize', '~> 6.0.2'
+gem 'sanitize', '~> 6.1.0'
 # HTML autolinking for mails and urls (replaces autolink)
 gem 'rinku', '~> 2.0.4', require: %w[rinku rails_rinku]
 # Version parsing with semver
@@ -210,6 +210,11 @@ gem 'view_component'
 # Lookbook
 gem 'lookbook', '~> 2.0.5'
 
+# Require factory_bot for usage with openproject plugins testing
+gem 'factory_bot', '~> 6.2.0', require: false
+# require factory_bot_rails for convenience in core development
+gem 'factory_bot_rails', '~> 6.2.0', require: false
+
 gem 'turbo-rails', "~> 1.1"
 
 group :test do
@@ -251,6 +256,8 @@ group :test do
   gem 'fuubar', '~> 2.5.0'
   gem 'timecop', '~> 0.9.0'
 
+  # Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.
+  gem 'vcr'
   # Mock backend requests (for ruby tests)
   gem 'webmock', '~> 3.12', require: false
 
@@ -286,10 +293,6 @@ end
 
 group :development, :test do
   gem 'dotenv-rails'
-  # Require factory_bot for usage with openproject plugins testing
-  gem 'factory_bot', '~> 6.2.0'
-  # require factory_bot_rails for convenience in core development
-  gem 'factory_bot_rails', '~> 6.2.0'
 
   # Tracing and profiling gems
   gem 'flamegraph', require: false
@@ -310,6 +313,10 @@ group :development, :test do
   gem 'rubocop-rspec', require: false
   gem 'rubocop-performance', require: false
 
+  # erb linting
+  gem "erb_lint", require: false
+  gem "erblint-github", require: false
+
   # Brakeman scanner
   gem 'brakeman', '~> 6.0.0'
 end
@@ -356,6 +363,6 @@ gemfiles.each do |file|
   send(:eval_gemfile, file) if File.readable?(file)
 end
 
-gem "openproject-primer_view_components", '~>0.9.1'
+gem "openproject-primer_view_components", '~>0.11.0'
 gem "openproject-octicons", '~>19.7.0'
 gem "openproject-octicons_helper", '~>19.7.0'

Gemfile.lock

@@ -310,16 +310,16 @@ GEM
     awesome_nested_set (3.5.0)
       activerecord (>= 4.0.0, < 7.1)
     aws-eventstream (1.2.0)
-    aws-partitions (1.817.0)
-    aws-sdk-core (3.181.0)
+    aws-partitions (1.826.0)
+    aws-sdk-core (3.183.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-kms (1.71.0)
       aws-sdk-core (~> 3, >= 3.177.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.134.0)
+    aws-sdk-s3 (1.135.0)
       aws-sdk-core (~> 3, >= 3.181.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
@@ -330,6 +330,13 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.1.1)
     bcrypt (3.1.19)
+    better_html (2.0.2)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      parser (>= 2.4)
+      smart_properties
     bindata (2.4.15)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
@@ -436,19 +443,28 @@ GEM
       activemodel
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
+    erb_lint (0.5.0)
+      activesupport
+      better_html (>= 2.0.1)
+      parser (>= 2.7.1.4)
+      rainbow
+      rubocop
+      smart_properties
+    erblint-github (0.4.1)
     erubi (1.12.0)
     escape_utils (1.3.0)
     et-orbi (1.2.7)
       tzinfo
     eventmachine (1.2.7)
     eventmachine_httpserver (0.2.1)
-    excon (0.102.0)
+    excon (0.103.0)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.7.10)
+    faraday (2.7.11)
+      base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-follow_redirects (0.3.0)
@@ -460,7 +476,7 @@ GEM
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
       websocket-driver (>= 0.6, < 0.8)
-    ffi (1.15.5)
+    ffi (1.16.1)
     flamegraph (0.9.5)
     fog-aws (3.19.0)
       fog-core (~> 2.1)
@@ -504,9 +520,9 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-gmail_v1 (0.30.0)
+    google-apis-gmail_v1 (0.32.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    googleauth (1.8.0)
+    googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
@@ -572,7 +588,7 @@ GEM
     language_server-protocol (3.17.0.3)
     launchy (2.5.2)
       addressable (~> 2.8)
-    lefthook (1.4.10)
+    lefthook (1.5.0)
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
     listen (3.8.0)
@@ -664,7 +680,7 @@ GEM
       actionview
       openproject-octicons (= 19.7.0)
       railties
-    openproject-primer_view_components (0.9.1)
+    openproject-primer_view_components (0.11.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       openproject-octicons (>= 19.7.0)
@@ -723,7 +739,7 @@ GEM
       eventmachine_httpserver
       http_parser.rb (~> 0.6.0)
       multi_json
-    puma (6.3.1)
+    puma (6.4.0)
       nio4r (~> 2.0)
     puma-plugin-statsd (2.5.0)
       puma (>= 5.0, < 7)
@@ -854,18 +870,18 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
+    rubocop-capybara (2.19.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.23.1)
+    rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
-    rubocop-performance (1.19.0)
+    rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.21.0)
+    rubocop-rails (2.21.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-    rubocop-rspec (2.24.0)
+    rubocop-rspec (2.24.1)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
@@ -884,7 +900,7 @@ GEM
     rubytree (2.0.2)
       json (~> 2.0, > 2.3.1)
     rubyzip (2.3.2)
-    sanitize (6.0.2)
+    sanitize (6.1.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     secure_headers (6.5.0)
@@ -903,6 +919,7 @@ GEM
       multi_json (~> 1.10)
     simpleidn (0.2.1)
       unf (~> 0.1.4)
+    smart_properties (1.17.0)
     spreadsheet (1.3.0)
       ruby-ole
     spring (4.1.1)
@@ -961,7 +978,8 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    view_component (3.5.0)
+    vcr (6.2.0)
+    view_component (3.6.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -1038,6 +1056,8 @@ DEPENDENCIES
   dry-container
   email_validator (~> 2.2.3)
   equivalent-xml (~> 0.6)
+  erb_lint
+  erblint-github
   escape_utils (~> 1.3)
   factory_bot (~> 6.2.0)
   factory_bot_rails (~> 6.2.0)
@@ -1094,7 +1114,7 @@ DEPENDENCIES
   openproject-octicons (~> 19.7.0)
   openproject-octicons_helper (~> 19.7.0)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.9.1)
+  openproject-primer_view_components (~> 0.11.0)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!
@@ -1145,7 +1165,7 @@ DEPENDENCIES
   ruby-prof
   ruby-progressbar (~> 1.13.0)
   rubytree (~> 2.0.0)
-  sanitize (~> 6.0.2)
+  sanitize (~> 6.1.0)
   secure_headers (~> 6.5.0)
   selenium-webdriver (~> 4.12.0)
   semantic (~> 1.6.1)
@@ -1170,6 +1190,7 @@ DEPENDENCIES
   typed_dag (~> 2.0.2)
   tzinfo-data (~> 1.2023.1)
   validate_url
+  vcr
   view_component
   warden (~> 1.2)
   warden-basic_auth (~> 0.2.1)