Release OpenProject 10.6.0

Author: oliverguenther

.editorconfig

@@ -474,7 +474,7 @@ ij_ruby_spaces_around_other_operators = true
 ij_ruby_spaces_around_range_operators = false
 ij_ruby_spaces_around_relational_operators = true
 ij_ruby_spaces_within_array_initializer_braces = true
-ij_ruby_spaces_within_braces = false
+ij_ruby_spaces_within_braces = true
 
 [{version-autocompleter.component.ts,*.ats,*.ts}]
 ij_continuation_indent_size = 2

.github/workflows/pullpreview.yml

@@ -0,0 +1,31 @@
+name: PullPreview
+on:
+  push:
+  pull_request:
+    types: [labeled, unlabeled, closed]
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@v2
+    - name: Generate .env.pullpreview file
+      run: |
+        echo "OP_ADMIN_USER_SEEDER_FORCE_PASSWORD_CHANGE=off" >> .env.pullpreview
+        echo "OPENPROJECT_SHOW__SETTING__MISMATCH__WARNING=false" >> .env.pullpreview
+    - name: Boot as BIM edition
+      if: contains(github.ref, 'bim/') || contains(github.head_ref, 'bim/')
+      run: |
+        echo "OPENPROJECT_EDITION=bim" >> .env.pullpreview
+    - uses: pullpreview/action@master
+      with:
+        admins: crohr,HDinger,machisuji,oliverguenther,ulferts,wielinde
+        always_on: dev
+        compose_files: docker-compose.pullpreview.yml
+        instance_type: medium_2_0
+      env:
+        AWS_ACCESS_KEY_ID: "${{ secrets.AWS_ACCESS_KEY_ID }}"
+        AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"
+        AWS_REGION: eu-central-1

Gemfile

@@ -34,7 +34,7 @@ gem 'actionpack-xml_parser', '~> 2.0.0'
 gem 'activemodel-serializers-xml', '~> 1.0.1'
 gem 'activerecord-import', '~> 1.0.2'
 gem 'activerecord-session_store', '~> 1.1.0'
-gem 'rails', '~> 6.0.2'
+gem 'rails', '~> 6.0.3.1'
 gem 'responders', '~> 3.0'
 
 gem 'rdoc', '>= 2.4.2'
@@ -178,7 +178,7 @@ gem 'aws-sdk-core', '~> 3.91.0'
 # File upload via fog + screenshots on travis
 gem 'aws-sdk-s3', '~> 1.61.0'
 
-gem 'openproject-token', '~> 1.0.2'
+gem 'openproject-token', '~> 2.0'
 
 gem 'plaintext', '~> 0.3.2'
 

Gemfile.lock

@@ -195,57 +195,57 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actioncable (6.0.2.2)
-      actionpack (= 6.0.2.2)
+    actioncable (6.0.3.1)
+      actionpack (= 6.0.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activejob (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
-      activestorage (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionmailbox (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      actionview (= 6.0.2.2)
-      activejob (= 6.0.2.2)
+    actionmailer (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      actionview (= 6.0.3.1)
+      activejob (= 6.0.3.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.2.2)
-      actionview (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionpack (6.0.3.1)
+      actionview (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-xml_parser (2.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    actiontext (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
-      activestorage (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actiontext (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionview (6.0.3.1)
+      activesupport (= 6.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    activejob (6.0.3.1)
+      activesupport (= 6.0.3.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
     activerecord-import (1.0.4)
       activerecord (>= 3.2)
     activerecord-nulldb-adapter (0.4.0)
@@ -256,17 +256,17 @@ GEM
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 1.5.2, < 3)
       railties (>= 4.0)
-    activestorage (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activejob (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
+    activestorage (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
       marcel (~> 0.3.1)
-    activesupport (6.0.2.2)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     acts_as_list (0.9.19)
       activerecord (>= 3.0)
     acts_as_tree (2.9.1)
@@ -597,7 +597,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.4.0)
+    loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -611,11 +611,11 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
-    mimemagic (0.3.4)
+    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minisyntax (0.2.5)
-    minitest (5.14.0)
+    minitest (5.14.1)
     mixlib-shellout (2.1.0)
     msgpack (1.3.3)
     multi_json (1.14.1)
@@ -654,7 +654,8 @@ GEM
       validate_email
       validate_url
       webfinger (>= 1.0.1)
-    openproject-token (1.0.2)
+    openproject-token (2.0)
+      activemodel
     parallel (1.19.1)
     parallel_tests (2.32.0)
       parallel
@@ -710,7 +711,7 @@ GEM
       eventmachine_httpserver
       http_parser.rb (~> 0.6.0)
       multi_json
-    puma (4.3.3)
+    puma (4.3.5)
       nio4r (~> 2.0)
     rack (2.2.2)
     rack-accept (0.4.5)
@@ -732,20 +733,20 @@ GEM
     rack_session_access (0.2.0)
       builder (>= 2.0.0)
       rack (>= 1.0.0)
-    rails (6.0.2.2)
-      actioncable (= 6.0.2.2)
-      actionmailbox (= 6.0.2.2)
-      actionmailer (= 6.0.2.2)
-      actionpack (= 6.0.2.2)
-      actiontext (= 6.0.2.2)
-      actionview (= 6.0.2.2)
-      activejob (= 6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
-      activestorage (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    rails (6.0.3.1)
+      actioncable (= 6.0.3.1)
+      actionmailbox (= 6.0.3.1)
+      actionmailer (= 6.0.3.1)
+      actionpack (= 6.0.3.1)
+      actiontext (= 6.0.3.1)
+      actionview (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.2.2)
+      railties (= 6.0.3.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
@@ -764,9 +765,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    railties (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -922,7 +923,7 @@ GEM
     ttfunk (1.6.2.1)
     typed_dag (2.0.2)
       rails (>= 5.0.4)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     tzinfo-data (1.2019.3)
       tzinfo (>= 1.0.0)
@@ -1061,7 +1062,7 @@ DEPENDENCIES
   openproject-pdf_export!
   openproject-recaptcha!
   openproject-reporting!
-  openproject-token (~> 1.0.2)
+  openproject-token (~> 2.0)
   openproject-translations!
   openproject-two_factor_authentication!
   openproject-webhooks!
@@ -1085,7 +1086,7 @@ DEPENDENCIES
   rack-protection (~> 2.0.8)
   rack-test (~> 1.1.0)
   rack_session_access
-  rails (~> 6.0.2)
+  rails (~> 6.0.3.1)
   rails-controller-testing (~> 1.0.2)
   rails-i18n (~> 6.0.0)
   rails_12factor

app/assets/images/new_feature_teaser.jpg

@@ -30,6 +30,7 @@
         var demoProjectsAvailable = $('meta[name=demo_projects_available]').attr('content') === "true";
         var boardsDemoDataAvailable = $('meta[name=boards_demo_data_available]').attr('content') === "true";
         var eeTokenAvailable = !$('body').hasClass('ee-banners-visible');
+        var tourCancelled = false;
 
         // ------------------------------- Initial start -------------------------------
         // Do not show the tutorial on mobile or when the demo data has been deleted
@@ -43,8 +44,17 @@
 
                 // Start automatically when the language selection is closed
                 $('.op-modal--modal-close-button').click(function () {
+                    tourCancelled = true;
                     homescreenTour();
                 });
+
+                //Start automatically when the escape button is pressed
+                document.addEventListener('keydown', function(event) {
+                    if (event.key == "Escape" && !tourCancelled) {
+                        tourCancelled = true;
+                        homescreenTour();
+                    }
+                }, { once: true });
             }
 
             // ------------------------------- Tutorial Homescreen page -------------------------------

app/assets/javascripts/onboarding/onboarding_tour.js

@@ -31,7 +31,7 @@
 span.errorSpan
   font-weight: bold
   width: 100%
-
+  
   textarea, select, input
     &, &:hover, &:focus
       border: 2px solid $content-form-error-color

app/assets/javascripts/vendor/ckeditor/ckeditor.js

@@ -35,3 +35,21 @@
 
 .summary
   font-style: italic
+
+.news-author
+  font-size: 0.8rem
+  color: $gray-dark
+  display: block
+  padding: 5px 0 5px 40px
+  line-height: 1.25
+
+.news-author-avatar
+  margin-right: 5px
+  float: left
+
+.news-project
+  line-height: 1
+
+@media screen and (max-width: 679px)
+  .news-author
+    padding-left: 0