Release OpenProject 8.3.2

Dockerfile

@@ -82,4 +82,3 @@ EXPOSE 80 5432
 VOLUME ["$PGDATA", "$APP_DATA_PATH"]
 ENTRYPOINT ["./docker/entrypoint.sh"]
 CMD ["./docker/supervisord"]
-

Gemfile

@@ -172,7 +172,7 @@ gem 'sprockets', '~> 3.7.0'
 # also, better than thin since we can control worker concurrency.
 gem 'unicorn'
 
-gem 'nokogiri', '~> 1.10.0'
+gem 'nokogiri', '~> 1.10.3'
 
 gem 'carrierwave', '~> 1.3.1'
 gem 'fog-aws'
@@ -302,7 +302,6 @@ group :docker, optional: true do
   gem 'passenger', '~> 6.0.1'
 
   # Used to easily precompile assets
-  gem 'health_check', require: !!ENV['HEROKU']
   gem 'newrelic_rpm', require: !!ENV['HEROKU']
   gem 'rails_12factor', require: !!ENV['HEROKU']
 end

Gemfile.lock

@@ -101,117 +101,117 @@ GIT
 PATH
   remote: modules/auth_plugins
   specs:
-    openproject-auth_plugins (8.3.1)
+    openproject-auth_plugins (8.3.2)
       omniauth (~> 1.0)
 
 PATH
   remote: modules/auth_saml
   specs:
-    openproject-auth_saml (8.3.1)
+    openproject-auth_saml (8.3.2)
       omniauth-saml (~> 1.10.1)
 
 PATH
   remote: modules/avatars
   specs:
-    openproject-avatars (8.3.1)
+    openproject-avatars (8.3.2)
       fastimage (~> 2.1.0)
       gravatar_image_tag (~> 1.2.0)
 
 PATH
   remote: modules/backlogs
   specs:
-    openproject-backlogs (8.3.1)
+    openproject-backlogs (8.3.2)
       acts_as_silent_list (~> 3.0.0)
-      openproject-pdf_export (= 8.3.1)
+      openproject-pdf_export (= 8.3.2)
 
 PATH
   remote: modules/costs
   specs:
-    openproject-costs (8.3.1)
+    openproject-costs (8.3.2)
 
 PATH
   remote: modules/documents
   specs:
-    openproject-documents (8.3.1)
+    openproject-documents (8.3.2)
 
 PATH
   remote: modules/github_integration
   specs:
-    openproject-github_integration (8.3.1)
+    openproject-github_integration (8.3.2)
       openproject-webhooks
 
 PATH
   remote: modules/global_roles
   specs:
-    openproject-global_roles (8.3.1)
+    openproject-global_roles (8.3.2)
 
 PATH
   remote: modules/grids
   specs:
-    grids (8.3.1)
+    grids (8.3.2)
 
 PATH
   remote: modules/ldap_groups
   specs:
-    openproject-ldap_groups (8.3.1)
+    openproject-ldap_groups (8.3.2)
 
 PATH
   remote: modules/meeting
   specs:
-    openproject-meeting (8.3.1)
+    openproject-meeting (8.3.2)
       icalendar (~> 2.5.0)
 
 PATH
   remote: modules/my_project_page
   specs:
-    openproject-my_project_page (8.3.1)
+    openproject-my_project_page (8.3.2)
 
 PATH
   remote: modules/openid_connect
   specs:
-    openproject-openid_connect (8.3.1)
+    openproject-openid_connect (8.3.2)
       lobby_boy (~> 0.1.3)
       omniauth-openid_connect-providers (~> 0.1)
       openproject-auth_plugins (~> 8.0)
 
 PATH
   remote: modules/pdf_export
   specs:
-    openproject-pdf_export (8.3.1)
+    openproject-pdf_export (8.3.2)
       pdf-inspector (~> 1.3.0)
       prawn (~> 2.2)
 
 PATH
   remote: modules/reporting_engine
   specs:
-    reporting_engine (8.3.1)
+    reporting_engine (8.3.2)
       json
 
 PATH
   remote: modules/reporting
   specs:
-    openproject-reporting (8.3.1)
+    openproject-reporting (8.3.2)
       jquery-tablesorter (~> 1.25.5)
-      openproject-costs (= 8.3.1)
+      openproject-costs (= 8.3.2)
       reporting_engine (>= 1.1.0)
 
 PATH
   remote: modules/two_factor_authentication
   specs:
-    openproject-two_factor_authentication (8.3.1)
+    openproject-two_factor_authentication (8.3.2)
       aws-sdk-sns (~> 1.1.0)
       messagebird-rest (~> 1.3.2)
       rotp (~> 3.3)
 
 PATH
   remote: modules/webhooks
   specs:
-    openproject-webhooks (8.3.1)
+    openproject-webhooks (8.3.2)
 
 PATH
   remote: modules/xls_export
   specs:
-    openproject-xls_export (8.3.1)
+    openproject-xls_export (8.3.2)
       spreadsheet (~> 0.8.9)
 
 GEM
@@ -480,8 +480,6 @@ GEM
     hashdiff (0.3.8)
     hashery (2.1.2)
     hashie (3.6.0)
-    health_check (3.0.0)
-      railties (>= 5.0)
     html-pipeline (2.8.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
@@ -493,7 +491,7 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n-js (3.2.1)
       i18n (>= 0.6.6)
-    icalendar (2.5.2)
+    icalendar (2.5.3)
       ice_cube (~> 0.16)
     ice_cube (0.16.3)
     ice_nine (0.11.2)
@@ -566,7 +564,7 @@ GEM
     netrc (0.11.0)
     newrelic_rpm (6.0.0.351)
     nio4r (2.3.1)
-    nokogiri (1.10.1)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.1)
       nokogiri (~> 1.8, >= 1.8.4)
@@ -760,7 +758,7 @@ GEM
       iso8601
     ruby-enum (0.7.2)
       i18n
-    ruby-ole (1.2.12.1)
+    ruby-ole (1.2.12.2)
     ruby-prof (0.17.0)
     ruby-progressbar (1.10.0)
     ruby-rc4 (0.1.5)
@@ -936,7 +934,6 @@ DEPENDENCIES
   gon (~> 6.2.1)
   grape (~> 1.2.3)
   grids!
-  health_check
   html-pipeline (~> 2.8.0)
   htmldiff
   i18n-js (~> 3.2.0)
@@ -951,7 +948,7 @@ DEPENDENCIES
   mysql2 (~> 0.5.0)
   net-ldap (~> 0.16.0)
   newrelic_rpm
-  nokogiri (~> 1.10.0)
+  nokogiri (~> 1.10.3)
   oj (~> 3.7.0)
   okcomputer (~> 1.17.3)
   omniauth!

app/controllers/concerns/omniauth_login.rb

@@ -111,7 +111,7 @@ def show_error(error)
   # in our database) will be created using this method.
   def create_user_from_omniauth(user, auth_hash)
     # Self-registration off
-    return self_registration_disabled unless Setting.self_registration?
+    return self_registration_disabled unless Setting.self_registration? || user.invited?
 
     fill_user_fields_from_omniauth user, auth_hash
 

app/models/journal/aggregated_journal.rb

@@ -56,7 +56,7 @@ def with_notes_id(notes_id)
       # Therefore we have to provide the notes_id to the aggregation on top of it being used
       # in the where clause to pick the desired AggregatedJournal.
       raw_journal = query_aggregated_journals(journal_id: notes_id)
-                    .where("#{table_name}.id = #{notes_id}")
+                    .where("#{table_name}.id = ?", notes_id)
                     .first
 
       raw_journal ? Journal::AggregatedJournal.new(raw_journal) : nil

config/initializers/health_checks.rb

@@ -17,9 +17,6 @@ def check
   end
 end
 
-# Mount at /health_checks
-OkComputer.mount_at = 'health_checks'
-
 # Register delayed_job backed up test
 dj_max = OpenProject::Configuration.health_checks_jobs_queue_count_threshold
 OkComputer::Registry.register "delayed_jobs_backed_up",
@@ -32,6 +29,24 @@ def check
 # Make dj backed up optional due to bursts
 OkComputer.make_optional %w(delayed_jobs_backed_up)
 
+# Register web worker check for web + database
+OkComputer::CheckCollection.new('web').tap do |collection|
+  collection.register :default, OkComputer::Registry.fetch('default')
+  collection.register :database, OkComputer::Registry.fetch('database')
+  OkComputer::Registry.default_collection.register 'web', collection
+end
+
+# Register full check for web + database + dj worker
+OkComputer::CheckCollection.new('full').tap do |collection|
+  collection.register :default, OkComputer::Registry.fetch('default')
+  collection.register :database, OkComputer::Registry.fetch('database')
+  collection.register :mail, OkComputer::ActionMailerCheck.new
+  collection.register :delayed_jobs_backed_up, OkComputer::Registry.fetch('delayed_jobs_backed_up')
+  collection.register :delayed_jobs_never_ran, OkComputer::Registry.fetch('delayed_jobs_never_ran')
+  OkComputer::Registry.default_collection.register 'full', collection
+end
+
+
 # Check if authentication required
 authentication_password = OpenProject::Configuration.health_checks_authentication_password
 if authentication_password.present?

config/locales/crowdin/af.yml

@@ -2932,7 +2932,3 @@ af:
     revoke_my_application_confirmation: Do you really want to remove this application?
       This will revoke %{token_count} active for it.
     my_registered_applications: Registered OAuth applications
-  setting_mail_handler_api_enabled: Enable incoming email web service
-  setting_mail_handler_api_description: The email web handler enables OpenProject
-    to receive emails containing specific commands as an instrumentation mechanism
-    (e.g., to create and update work packages).

config/locales/crowdin/ar.yml

@@ -2995,7 +2995,3 @@ ar:
     revoke_my_application_confirmation: Do you really want to remove this application?
       This will revoke %{token_count} active for it.
     my_registered_applications: Registered OAuth applications
-  setting_mail_handler_api_enabled: تمكين خدمة ويب البريد الإلكتروني الوارد
-  setting_mail_handler_api_description: معالج ويب البريد الإلكتروني يتيح لOPEN Project
-    أن يتلقى رسائل البريد الإلكتروني التي تحتوي على أوامر محددة كآلية لأجهزة (مثلاً،
-    لإنشاء وتحديث حزم العمل).

config/locales/crowdin/az.yml

@@ -2919,7 +2919,3 @@ az:
     revoke_my_application_confirmation: Do you really want to remove this application?
       This will revoke %{token_count} active for it.
     my_registered_applications: Registered OAuth applications
-  setting_mail_handler_api_enabled: Enable incoming email web service
-  setting_mail_handler_api_description: The email web handler enables OpenProject
-    to receive emails containing specific commands as an instrumentation mechanism
-    (e.g., to create and update work packages).

config/locales/crowdin/bg.yml

@@ -2928,7 +2928,3 @@ bg:
     revoke_my_application_confirmation: Do you really want to remove this application?
       This will revoke %{token_count} active for it.
     my_registered_applications: Registered OAuth applications
-  setting_mail_handler_api_enabled: Enable incoming email web service
-  setting_mail_handler_api_description: Имейл уеб манипулаторът позволява на OpenProject
-    да получава имейли, съдържащи конкретни команди като инструментален механизъм
-    (например, за да създава и актуализира работни пакети).

config/locales/crowdin/ca.yml

@@ -2986,9 +2986,3 @@ ca:
     revoke_my_application_confirmation: Do you really want to remove this application?
       This will revoke %{token_count} active for it.
     my_registered_applications: Registered OAuth applications
-  setting_mail_handler_api_enabled: Habilitar el servei web de correus electrònics
-    entrants
-  setting_mail_handler_api_description: El controlador de correu web permet a OpenProject
-    rebre missatges de correu electrònic que continguin ordres específiques com un
-    mecanisme d'instrumentació (per exemple, per crear i actualitzar els paquets de
-    treball).

config/locales/crowdin/cs.yml

@@ -2980,7 +2980,3 @@ cs:
     revoke_my_application_confirmation: Do you really want to remove this application?
       This will revoke %{token_count} active for it.
     my_registered_applications: Registered OAuth applications
-  setting_mail_handler_api_enabled: Enable incoming email web service
-  setting_mail_handler_api_description: The email web handler enables OpenProject
-    to receive emails containing specific commands as an instrumentation mechanism
-    (e.g., to create and update work packages).

config/locales/crowdin/da.yml

@@ -2922,7 +2922,3 @@ da:
     revoke_my_application_confirmation: Do you really want to remove this application?
       This will revoke %{token_count} active for it.
     my_registered_applications: Registered OAuth applications
-  setting_mail_handler_api_enabled: Aktivér indgående e-mailwebtjeneste
-  setting_mail_handler_api_description: E-mail webhåndteringen muliggør, at OpenProject
-    kan modtage e-mails indeholdende specifikke kommandoer, som en mekanisme til instrumentering
-    (f.eks., at oprette og opdatere arbejdspakker).