Merge branch 'dev' into corrections-for-docs-201012

.codeclimate.yml

@@ -27,7 +27,7 @@ checks:
 plugins:
   rubocop:
     enabled: true
-    channel: rubocop-0-90
+    channel: rubocop-0-91
   # Codeclimate uses brakeman 4.3.1 which does not support rails 6
   # Check https://docs.codeclimate.com/docs/brakeman for updates.
   brakeman:

Gemfile

@@ -125,7 +125,7 @@ gem 'rack-attack', '~> 6.3.1'
 gem 'secure_headers', '~> 6.3.0'
 
 # Browser detection for incompatibility checks
-gem 'browser', '~> 4.2.0'
+gem 'browser', '~> 5.1.0'
 
 # Providing health checks
 gem 'okcomputer', '~> 1.18.1'
@@ -175,9 +175,9 @@ gem 'carrierwave', '~> 1.3.1'
 gem 'carrierwave_direct', '~> 2.1.0'
 gem 'fog-aws'
 
-gem 'aws-sdk-core', '~> 3.105.0'
+gem 'aws-sdk-core', '~> 3.107'
 # File upload via fog + screenshots on travis
-gem 'aws-sdk-s3', '~> 1.80.0'
+gem 'aws-sdk-s3', '~> 1.80'
 
 gem 'openproject-token', '~> 2.1.1'
 
@@ -236,7 +236,8 @@ group :test do
   gem 'json_spec', '~> 1.1.4'
   gem 'shoulda-matchers', '~> 4.4', require: nil
 
-  gem 'parallel_tests', '~> 3.1'
+  # For unknown reasons, parallel_tests 3.3 fails on travis.
+  gem 'parallel_tests', '~> 3.1', '< 3.3.0'
 end
 
 group :ldap do
@@ -282,7 +283,7 @@ group :development, :test do
   gem 'danger', '~> 8.0.5'
 
   # Brakeman scanner
-  gem 'brakeman', '~> 4.9.0'
+  gem 'brakeman', '~> 4.10.0'
   gem 'danger-brakeman'
 end
 

Gemfile.lock

@@ -133,7 +133,7 @@ PATH
   remote: modules/meeting
   specs:
     openproject-meeting (1.0.0)
-      icalendar (~> 2.6.1)
+      icalendar (~> 2.7.0)
 
 PATH
   remote: modules/my_page
@@ -168,18 +168,11 @@ PATH
     openproject-recaptcha (1.0.0)
       recaptcha (~> 5.5)
 
-PATH
-  remote: modules/reporting_engine
-  specs:
-    reporting_engine (1.0.0)
-      json
-
 PATH
   remote: modules/reporting
   specs:
     openproject-reporting (1.0.0)
       costs
-      reporting_engine
 
 PATH
   remote: modules/two_factor_authentication
@@ -295,17 +288,17 @@ GEM
     awesome_nested_set (3.2.1)
       activerecord (>= 4.0.0, < 7.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.368.0)
-    aws-sdk-core (3.105.0)
+    aws-partitions (1.380.0)
+    aws-sdk-core (3.109.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.37.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-kms (1.39.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.80.0)
-      aws-sdk-core (~> 3, >= 3.104.3)
+    aws-sdk-s3 (1.83.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sdk-sns (1.30.0)
@@ -320,8 +313,8 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.4.8)
       msgpack (~> 1.0)
-    brakeman (4.9.1)
-    browser (4.2.0)
+    brakeman (4.10.0)
+    browser (5.1.0)
     builder (3.2.4)
     byebug (11.1.3)
     capybara (3.33.0)
@@ -369,8 +362,7 @@ GEM
     cookiejar (0.3.3)
     cork (0.3.0)
       colored2 (~> 3.1)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    crack (0.4.4)
     crass (1.0.6)
     crowdin-api (0.6.0)
       rest-client (~> 2.0)
@@ -397,7 +389,7 @@ GEM
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
     daemons (1.3.1)
-    dalli (2.7.10)
+    dalli (2.7.11)
     danger (8.0.5)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
@@ -456,7 +448,7 @@ GEM
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
-    dry-logic (1.0.7)
+    dry-logic (1.0.8)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
@@ -491,7 +483,7 @@ GEM
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
-    faker (2.13.0)
+    faker (2.14.0)
       i18n (>= 1.6, < 2)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
@@ -505,7 +497,7 @@ GEM
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (2.2.0)
+    fog-core (2.2.3)
       builder
       excon (~> 0.71)
       formatador (~> 0.2)
@@ -558,7 +550,7 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n-js (3.7.1)
       i18n (>= 0.6.6)
-    icalendar (2.6.1)
+    icalendar (2.7.0)
       ice_cube (~> 0.16)
     ice_cube (0.16.3)
     interception (0.5)
@@ -664,15 +656,15 @@ GEM
     parallel (1.19.2)
     parallel_tests (3.2.0)
       parallel
-    parser (2.7.1.4)
+    parser (2.7.1.5)
       ast (~> 2.4.1)
     passenger (6.0.6)
       rack
       rake (>= 0.8.1)
     pdf-core (0.8.1)
     pdf-inspector (1.3.0)
       pdf-reader (>= 1.0, < 3.0.a)
-    pdf-reader (2.4.0)
+    pdf-reader (2.4.1)
       Ascii85 (~> 1.0.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
@@ -716,7 +708,7 @@ GEM
       eventmachine_httpserver
       http_parser.rb (~> 0.6.0)
       multi_json
-    puma (5.0.0)
+    puma (5.0.2)
       nio4r (~> 2.0)
     rack (2.2.3)
     rack-accept (0.4.5)
@@ -725,7 +717,7 @@ GEM
       rack (>= 1.0, < 3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-mini-profiler (2.0.4)
+    rack-mini-profiler (2.1.0)
       rack (>= 1.2.0)
     rack-oauth2 (1.16.0)
       activesupport
@@ -790,7 +782,7 @@ GEM
     recaptcha (5.5.0)
       json
     redcarpet (3.5.0)
-    regexp_parser (1.7.1)
+    regexp_parser (1.8.1)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -810,13 +802,13 @@ GEM
     rinku (2.0.6)
     roar (1.1.0)
       representable (~> 3.0.0)
-    rotp (6.1.0)
+    rotp (6.2.0)
     rouge (3.23.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
+    rspec-core (3.9.3)
       rspec-support (~> 3.9.3)
     rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -835,17 +827,17 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.9.3)
-    rubocop (0.90.0)
+    rubocop (0.92.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 0.5.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.4.0)
-      parser (>= 2.7.1.4)
+    rubocop-ast (0.7.1)
+      parser (>= 2.7.1.5)
     ruby-duration (3.2.3)
       activesupport (>= 3.0.0)
       i18n
@@ -863,7 +855,6 @@ GEM
       json (~> 2.1)
       structured_warnings (~> 0.3)
     rubyzip (1.3.0)
-    safe_yaml (1.0.5)
     sanitize (5.2.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
@@ -943,7 +934,7 @@ GEM
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
-    validate_url (1.0.11)
+    validate_url (1.0.13)
       activemodel (>= 3.0.0)
       public_suffix
     warden (1.2.9)
@@ -986,12 +977,12 @@ DEPENDENCIES
   airbrake (~> 11.0.0)
   auto_strip_attributes (~> 2.5)
   awesome_nested_set (~> 3.2.0)
-  aws-sdk-core (~> 3.105.0)
-  aws-sdk-s3 (~> 1.80.0)
+  aws-sdk-core (~> 3.107)
+  aws-sdk-s3 (~> 1.80)
   bcrypt (~> 3.1.6)
   bootsnap (~> 1.4.5)
-  brakeman (~> 4.9.0)
-  browser (~> 4.2.0)
+  brakeman (~> 4.10.0)
+  browser (~> 5.1.0)
   budgets!
   capybara (~> 3.33.0)
   capybara-screenshot (~> 1.0.17)
@@ -1072,7 +1063,7 @@ DEPENDENCIES
   openproject-webhooks!
   openproject-xls_export!
   overviews!
-  parallel_tests (~> 3.1)
+  parallel_tests (~> 3.1, < 3.3.0)
   passenger (~> 6.0.1)
   pg (~> 1.2.2)
   plaintext (~> 0.3.2)
@@ -1096,7 +1087,6 @@ DEPENDENCIES
   rails-i18n (~> 6.0.0)
   rails_12factor
   rdoc (>= 2.4.2)
-  reporting_engine!
   request_store (~> 1.5.0)
   responders (~> 3.0)
   rest-client (~> 2.0)

Gemfile.modules

@@ -26,7 +26,6 @@ group :opf_plugins do
 	gem 'openproject-openid_connect',            path: 'modules/openid_connect'
 	gem 'openproject-documents',                 path: 'modules/documents'
 	gem 'openproject-xls_export',                path: 'modules/xls_export'
-	gem 'reporting_engine',                      path: 'modules/reporting_engine'
 	gem 'costs',                                 path: 'modules/costs'
 	gem 'openproject-reporting',                 path: 'modules/reporting'
 	gem 'openproject-meeting',                   path: 'modules/meeting'

config/locales/crowdin/de.yml

@@ -649,7 +649,7 @@ de:
             start_date:
               violates_relationships: "muss mindestens auf %{soonest_start} gesetzt werden, um Beziehungen zu anderen Arbeitspaketen nicht zu verletzten."
             status_id:
-              status_transition_invalid: "ist ungültig, da kein valider Übergang vom alten zum neuen Status für die aktuelle Rolle des Nutzers existiert."
+              status_transition_invalid: "ist ungültig da kein valider Übergang vom alten zum neuen Status für die aktuelle Rolle des Nutzers existiert."
               status_invalid_in_type: "ist ungültig, da der aktuelle Status nicht in diesem Typ vorhanden ist."
             type:
               cannot_be_milestone_due_to_children: "kann kein Meilenstein werden, da dieses Arbeitspaket Unterelemente besitzt."
@@ -1498,7 +1498,7 @@ de:
   label_next_week: "Woche vor"
   label_no_change_option: "(Keine Änderung)"
   label_no_data: "Es sind keine Daten vorhanden"
-  label_no_parent_page: "Keine übergeordnete Seite"
+  label_no_parent_page: "Keine Übergeordnete Seite"
   label_nothing_display: "Nichts anzuzeigen"
   label_nobody: "Niemand"
   label_not_found: 'nicht gefunden'
@@ -2671,7 +2671,7 @@ de:
         unsupported_response_type: 'Der Autorisierungsserver unterstützt diesen Antworttyp nicht.'
         #Access token errors
         invalid_client: 'Die Client-Authentifizierung ist aufgrund eines unbekannten Clients oder einer nicht unterstützten Anfrage fehlgeschlagen.'
-        invalid_grant: 'Die bereitgestellte Genehmigung ist ungültig, abgelaufen, widerrufen, entspricht nicht der Redirect-URI, die in der Autorisierungsanfrage verwendet wird oder wurde an einen anderen Client ausgegeben.'
+        invalid_grant: 'Die bereitgestellte Genehmigung ist ungültig, abgelaufen, widerrufen, entspricht nicht der Redirect-URI, die in der Autorisierungsanfrage verwendet wird oder an einen anderen Client ausgegeben wurde.'
         unsupported_grant_type: 'Der Autorisierungs-Grant-Typ wird vom Autorisierungsserver nicht unterstützt.'
         invalid_token:
           revoked: "Das Zugangstoken wurde widerrufen"

config/locales/crowdin/js-ar.yml

@@ -274,9 +274,9 @@ ar:
             current_new_feature_html: >
               The release contains various new features and improvements: <br> <ul class="%{list_styling_class}"> <li><b>Top-down scheduling</b> to define all project tasks involved. The start and finish dates of the parent are unaffected by its children.</li> <li><b>Versatile agile boards</b> allow you to create a work breakdown structure or to distribute tasks between subprojects.</li> <li><b>Project templates</b> for easy creation of new projects.</li> <li>Configuration of the projects page enabling better <b>project portfolio management.</b></li> </ul>
           bim:
-            learn_about_link: https://www.openproject.org/openproject-11-0-release
+            learn_about_link: https://www.openproject.org/openproject-bim-10-5
             current_new_feature_html: >
-              The release contains various new features and improvements: <br> <ul class="%{list_styling_class}"> <li><b>Top-down scheduling</b> to define all project tasks involved. The start and finish dates of the parent are unaffected by its children.</li> <li><b>Versatile agile boards</b> allow you to create a work breakdown structure or to distribute tasks between subprojects.</li> <li><b>Project templates</b> for easy creation of new projects.</li> <li>Configuration of the projects page enabling better <b>project portfolio management.</b></li> </ul>
+              OpenProject 10.5 now supports the <b>BIM Collaboration Format (BCF)</b> – the open issue tracking standard for BIM models.<br><br> <ul class="%{list_styling_class}"> <li>Easily create and <b>manage BIM issues</b> such as clashes, requests and questions in the interactive 3D IFC model and <b>share it with the project team.</b></li> <li>Integrate OpenProject with your favorite BIM software using the powerful <a target="_blank" href="%{bcf_api_link}">BCF REST API.</a></li> <li>Import and export BCF XML files.</li> </ul>
     label_activate: "تفعيل"
     label_add_column_after: "Add column after"
     label_add_column_before: "Add column before"

config/locales/crowdin/js-bg.yml

@@ -274,9 +274,9 @@ bg:
             current_new_feature_html: >
               Изданието съдържа различни нови функции и подобрения: <br> <ul class = "%{list_styling_class}"> <li> <b> Планиране отгоре надолу </b> за дефиниране на всички участващи задачи на проекта. Датите на начало и край на родителя не се влияят от неговите деца. </li> <li> <b> Универсалните agile-дъски </b> ви позволяват да създадете структура на разбивка на работата или да разпределите задачи между подпроектите. </li> <li> <b> Шаблони за проекти </b> за лесно създаване на нови проекти. </li> <li> Конфигуриране на страницата с проекти, позволяваща по-добро управление на портфолиото на проекти. </b> </li> </ ul>
           bim:
-            learn_about_link: https://www.openproject.org/openproject-11-0-release
+            learn_about_link: https://www.openproject.org/openproject-bim-10-5
             current_new_feature_html: >
-              Изданието съдържа различни нови функции и подобрения: <br> <ul class = "%{list_styling_class}"> <li> <b> Планиране отгоре надолу </b> за дефиниране на всички участващи задачи на проекта. Датите на начало и край на родителя не се влияят от неговите деца. </li> <li> <b> Универсалните agile-дъски </b> ви позволяват да създадете структура на разбивка на работата или да разпределите задачи между подпроектите. </li> <li> <b> Шаблони за проекти </b> за лесно създаване на нови проекти. </li> <li> Конфигуриране на страницата с проекти, позволяваща по-добро управление на портфолиото на проекти. </b> </li> </ ul>
+              OpenProject 10.5 now supports the <b>BIM Collaboration Format (BCF)</b> – the open issue tracking standard for BIM models.<br><br> <ul class="%{list_styling_class}"> <li>Easily create and <b>manage BIM issues</b> such as clashes, requests and questions in the interactive 3D IFC model and <b>share it with the project team.</b></li> <li>Integrate OpenProject with your favorite BIM software using the powerful <a target="_blank" href="%{bcf_api_link}">BCF REST API.</a></li> <li>Import and export BCF XML files.</li> </ul>
     label_activate: "Activate"
     label_add_column_after: "Add column after"
     label_add_column_before: "Add column before"

config/locales/crowdin/js-ca.yml

@@ -274,9 +274,9 @@ ca:
             current_new_feature_html: >
               The release contains various new features and improvements: <br> <ul class="%{list_styling_class}"> <li><b>Top-down scheduling</b> to define all project tasks involved. The start and finish dates of the parent are unaffected by its children.</li> <li><b>Versatile agile boards</b> allow you to create a work breakdown structure or to distribute tasks between subprojects.</li> <li><b>Project templates</b> for easy creation of new projects.</li> <li>Configuration of the projects page enabling better <b>project portfolio management.</b></li> </ul>
           bim:
-            learn_about_link: https://www.openproject.org/openproject-11-0-release
+            learn_about_link: https://www.openproject.org/openproject-bim-10-5
             current_new_feature_html: >
-              The release contains various new features and improvements: <br> <ul class="%{list_styling_class}"> <li><b>Top-down scheduling</b> to define all project tasks involved. The start and finish dates of the parent are unaffected by its children.</li> <li><b>Versatile agile boards</b> allow you to create a work breakdown structure or to distribute tasks between subprojects.</li> <li><b>Project templates</b> for easy creation of new projects.</li> <li>Configuration of the projects page enabling better <b>project portfolio management.</b></li> </ul>
+              OpenProject 10.5 now supports the <b>BIM Collaboration Format (BCF)</b> – the open issue tracking standard for BIM models.<br><br> <ul class="%{list_styling_class}"> <li>Easily create and <b>manage BIM issues</b> such as clashes, requests and questions in the interactive 3D IFC model and <b>share it with the project team.</b></li> <li>Integrate OpenProject with your favorite BIM software using the powerful <a target="_blank" href="%{bcf_api_link}">BCF REST API.</a></li> <li>Import and export BCF XML files.</li> </ul>
     label_activate: "Activar"
     label_add_column_after: "Afegir columna desprès"
     label_add_column_before: "Afegir columna abans"

config/locales/crowdin/js-cs.yml

@@ -274,9 +274,9 @@ cs:
             current_new_feature_html: >
               The release contains various new features and improvements: <br> <ul class="%{list_styling_class}"> <li><b>Top-down scheduling</b> to define all project tasks involved. The start and finish dates of the parent are unaffected by its children.</li> <li><b>Versatile agile boards</b> allow you to create a work breakdown structure or to distribute tasks between subprojects.</li> <li><b>Project templates</b> for easy creation of new projects.</li> <li>Configuration of the projects page enabling better <b>project portfolio management.</b></li> </ul>
           bim:
-            learn_about_link: https://www.openproject.org/openproject-11-0-release
+            learn_about_link: https://www.openproject.org/openproject-bim-10-5
             current_new_feature_html: >
-              The release contains various new features and improvements: <br> <ul class="%{list_styling_class}"> <li><b>Top-down scheduling</b> to define all project tasks involved. The start and finish dates of the parent are unaffected by its children.</li> <li><b>Versatile agile boards</b> allow you to create a work breakdown structure or to distribute tasks between subprojects.</li> <li><b>Project templates</b> for easy creation of new projects.</li> <li>Configuration of the projects page enabling better <b>project portfolio management.</b></li> </ul>
+              OpenProject 10.5 now supports the <b>BIM Collaboration Format (BCF)</b> – the open issue tracking standard for BIM models.<br><br> <ul class="%{list_styling_class}"> <li>Easily create and <b>manage BIM issues</b> such as clashes, requests and questions in the interactive 3D IFC model and <b>share it with the project team.</b></li> <li>Integrate OpenProject with your favorite BIM software using the powerful <a target="_blank" href="%{bcf_api_link}">BCF REST API.</a></li> <li>Import and export BCF XML files.</li> </ul>
     label_activate: "Aktivovat"
     label_add_column_after: "Přidat sloupec za"
     label_add_column_before: "Přidat sloupec před"