Merge branch 'release/8.3' into stable/8

Author: oliverguenther

Gemfile

@@ -33,7 +33,7 @@ ruby '~> 2.6.1'
 gem 'actionpack-xml_parser', '~> 2.0.0'
 gem 'activemodel-serializers-xml', '~> 1.0.1'
 gem 'activerecord-session_store', '~> 1.1.0'
-gem 'rails', '~> 5.2.2'
+gem 'rails', '~> 5.2.2.1'
 gem 'responders', '~> 2.4'
 
 gem 'rdoc', '>= 2.4.2'
@@ -152,7 +152,9 @@ group :production do
   # we use dalli as standard memcache client
   # requires memcached 1.4+
   # see https://github.clientom/mperham/dalli
-  gem 'dalli', '~> 2.7.6'
+  gem 'dalli',
+      git: 'https://github.com/petergoldstein/dalli',
+      ref: '0ff39199b5e91c6dbdaabc7c085b81938d0f08d2'
 
   # Unicorn worker killer to restart unicorn child workers
   gem 'unicorn-worker-killer', require: false
@@ -270,7 +272,7 @@ group :development, :test do
   gem 'pry-stack_explorer', '~> 0.4.9.2'
 end
 
-gem 'bootsnap', '~> 1.3.2', require: true
+gem 'bootsnap', '~> 1.3.2', require: false
 
 # API gems
 gem 'grape', '~> 1.2.3'

Gemfile.lock

@@ -74,6 +74,13 @@ GIT
       mixlib-shellout (~> 2.1.0)
       rubyzip
 
+GIT
+  remote: https://github.com/petergoldstein/dalli
+  revision: 0ff39199b5e91c6dbdaabc7c085b81938d0f08d2
+  ref: 0ff39199b5e91c6dbdaabc7c085b81938d0f08d2
+  specs:
+    dalli (2.7.9)
+
 GIT
   remote: https://github.com/rspec/rspec-activemodel-mocks
   revision: 6136a778f8b21f4f45f6b4ad5c2e2533e6d4ddc6
@@ -94,173 +101,173 @@ GIT
 PATH
   remote: modules/auth_plugins
   specs:
-    openproject-auth_plugins (8.3.0)
+    openproject-auth_plugins (8.3.1)
       omniauth (~> 1.0)
 
 PATH
   remote: modules/auth_saml
   specs:
-    openproject-auth_saml (8.3.0)
+    openproject-auth_saml (8.3.1)
       omniauth-saml (~> 1.10.1)
 
 PATH
   remote: modules/avatars
   specs:
-    openproject-avatars (8.3.0)
+    openproject-avatars (8.3.1)
       fastimage (~> 2.1.0)
       gravatar_image_tag (~> 1.2.0)
 
 PATH
   remote: modules/backlogs
   specs:
-    openproject-backlogs (8.3.0)
+    openproject-backlogs (8.3.1)
       acts_as_silent_list (~> 3.0.0)
-      openproject-pdf_export (= 8.3.0)
+      openproject-pdf_export (= 8.3.1)
 
 PATH
   remote: modules/costs
   specs:
-    openproject-costs (8.3.0)
+    openproject-costs (8.3.1)
 
 PATH
   remote: modules/documents
   specs:
-    openproject-documents (8.3.0)
+    openproject-documents (8.3.1)
 
 PATH
   remote: modules/github_integration
   specs:
-    openproject-github_integration (8.3.0)
+    openproject-github_integration (8.3.1)
       openproject-webhooks
 
 PATH
   remote: modules/global_roles
   specs:
-    openproject-global_roles (8.3.0)
+    openproject-global_roles (8.3.1)
 
 PATH
   remote: modules/grids
   specs:
-    grids (8.3.0)
+    grids (8.3.1)
 
 PATH
   remote: modules/ldap_groups
   specs:
-    openproject-ldap_groups (8.3.0)
+    openproject-ldap_groups (8.3.1)
 
 PATH
   remote: modules/meeting
   specs:
-    openproject-meeting (8.3.0)
+    openproject-meeting (8.3.1)
       icalendar (~> 2.5.0)
 
 PATH
   remote: modules/my_project_page
   specs:
-    openproject-my_project_page (8.3.0)
+    openproject-my_project_page (8.3.1)
 
 PATH
   remote: modules/openid_connect
   specs:
-    openproject-openid_connect (8.3.0)
+    openproject-openid_connect (8.3.1)
       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.0)
+    openproject-pdf_export (8.3.1)
       pdf-inspector (~> 1.3.0)
       prawn (~> 2.2)
 
 PATH
   remote: modules/reporting_engine
   specs:
-    reporting_engine (8.3.0)
+    reporting_engine (8.3.1)
       json
 
 PATH
   remote: modules/reporting
   specs:
-    openproject-reporting (8.3.0)
+    openproject-reporting (8.3.1)
       jquery-tablesorter (~> 1.25.5)
-      openproject-costs (= 8.3.0)
+      openproject-costs (= 8.3.1)
       reporting_engine (>= 1.1.0)
 
 PATH
   remote: modules/two_factor_authentication
   specs:
-    openproject-two_factor_authentication (8.3.0)
+    openproject-two_factor_authentication (8.3.1)
       aws-sdk-sns (~> 1.1.0)
       messagebird-rest (~> 1.3.2)
       rotp (~> 3.3)
 
 PATH
   remote: modules/webhooks
   specs:
-    openproject-webhooks (8.3.0)
+    openproject-webhooks (8.3.1)
 
 PATH
   remote: modules/xls_export
   specs:
-    openproject-xls_export (8.3.0)
+    openproject-xls_export (8.3.1)
       spreadsheet (~> 0.8.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
+    actioncable (5.2.2.1)
+      actionpack (= 5.2.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
+    actionmailer (5.2.2.1)
+      actionpack (= 5.2.2.1)
+      actionview (= 5.2.2.1)
+      activejob (= 5.2.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
+    actionpack (5.2.2.1)
+      actionview (= 5.2.2.1)
+      activesupport (= 5.2.2.1)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-xml_parser (2.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+    actionview (5.2.2.1)
+      activesupport (= 5.2.2.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+    activejob (5.2.2.1)
+      activesupport (= 5.2.2.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
+    activemodel (5.2.2.1)
+      activesupport (= 5.2.2.1)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
+    activerecord (5.2.2.1)
+      activemodel (= 5.2.2.1)
+      activesupport (= 5.2.2.1)
       arel (>= 9.0)
     activerecord-session_store (1.1.1)
       actionpack (>= 4.0)
       activerecord (>= 4.0)
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 1.5.2, < 3)
       railties (>= 4.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
+    activestorage (5.2.2.1)
+      actionpack (= 5.2.2.1)
+      activerecord (= 5.2.2.1)
       marcel (~> 0.3.1)
-    activesupport (5.2.2)
+    activesupport (5.2.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -384,7 +391,6 @@ GEM
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
     daemons (1.3.1)
-    dalli (2.7.7)
     database_cleaner (1.7.0)
     date_validator (0.9.0)
       activemodel
@@ -647,18 +653,18 @@ GEM
     rack_session_access (0.2.0)
       builder (>= 2.0.0)
       rack (>= 1.0.0)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails (5.2.2.1)
+      actioncable (= 5.2.2.1)
+      actionmailer (= 5.2.2.1)
+      actionpack (= 5.2.2.1)
+      actionview (= 5.2.2.1)
+      activejob (= 5.2.2.1)
+      activemodel (= 5.2.2.1)
+      activerecord (= 5.2.2.1)
+      activestorage (= 5.2.2.1)
+      activesupport (= 5.2.2.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.2)
+      railties (= 5.2.2.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
@@ -674,9 +680,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    railties (5.2.2.1)
+      actionpack (= 5.2.2.1)
+      activesupport (= 5.2.2.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -911,7 +917,7 @@ DEPENDENCIES
   cucumber (~> 3.1.0)
   cucumber-rails (~> 1.6.0)
   daemons
-  dalli (~> 2.7.6)
+  dalli!
   database_cleaner (~> 1.6)
   date_validator (~> 0.9.0)
   delayed_job_active_record (~> 4.1.1)
@@ -987,7 +993,7 @@ DEPENDENCIES
   rack-protection (~> 2.0.0)
   rack-test (~> 1.1.0)
   rack_session_access
-  rails (~> 5.2.2)
+  rails (~> 5.2.2.1)
   rails-controller-testing (~> 1.0.2)
   rails_12factor
   rdoc (>= 2.4.2)

app/assets/stylesheets/openproject/_generic.sass

@@ -62,6 +62,9 @@
 .total-hours
   font-weight: bold
 
+.-break-word
+  word-wrap: break-word
+
 .ellipsis,
 .form--field.ellipsis .form--label
   @include text-shortener