Release OpenProject 10.6.2

opf · Jun 23, 2020 · 633e577 · 633e577
2 parents 9058b21 + cce8c0e
commit 633e577
Show file tree

Hide file tree

Showing 321 changed files with 3,816 additions and 8,211 deletions.
diff --git a/.pkgr.yml b/.pkgr.yml
@@ -17,6 +17,8 @@ targets:
     <<: *debian9
   ubuntu-18.04:
     <<: *debian9
+  ubuntu-20.04:
+    <<: *debian9
   centos-8:
    dependencies:
       - epel-release

diff --git a/Gemfile b/Gemfile
@@ -85,7 +85,7 @@ gem 'escape_utils', '~> 1.0'
 # Syntax highlighting used in html-pipeline with rouge
 gem 'rouge', '~> 3.17.0'
 # HTML sanitization used for html-pipeline
-gem 'sanitize', '~> 5.1.0'
+gem 'sanitize', '~> 5.2.1'
 # HTML autolinking for mails and urls (replaces autolink)
 gem 'rinku', '~> 2.0.4'
 # Version parsing with semver

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -713,7 +713,7 @@ GEM
       multi_json
     puma (4.3.5)
       nio4r (~> 2.0)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (6.2.2)
@@ -861,7 +861,7 @@ GEM
       structured_warnings (~> 0.3)
     rubyzip (1.3.0)
     safe_yaml (1.0.5)
-    sanitize (5.1.0)
+    sanitize (5.2.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
@@ -1110,7 +1110,7 @@ DEPENDENCIES
   ruby-prof
   ruby-progressbar (~> 1.10.0)
   rubytree (~> 1.0.0)
-  sanitize (~> 5.1.0)
+  sanitize (~> 5.2.1)
   sassc-rails (~> 2.1.0)
   secure_headers (~> 6.3.0)
   selenium-webdriver (~> 3.14)

diff --git a/app/assets/stylesheets/content/_attributes_group.lsg b/app/assets/stylesheets/content/_attributes_group.lsg
@@ -137,7 +137,7 @@
       <h3 class="attributes-group--header-text">Related To</h3>
     </div>
     <div class="attributes-group--header-toggle">
-      <a href="#" class="button -small -transparent">Group by work package type</a>
+      <a href="#" class="button -small -transparent -with-icon icon-group-by icon-small">Group by work package type</a>
     </div>
   </div>
   <div class="content">

diff --git a/app/assets/stylesheets/content/_attributes_group.sass b/app/assets/stylesheets/content/_attributes_group.sass
@@ -59,7 +59,7 @@
   overflow-y: hidden
 
   .button
-    margin: 0 0 5px 0
+    margin: 0 0 8px 0
 
 // HACK. TODO: Remove H3 element rules in various places.
 .attributes-group--header-text,

diff --git a/app/assets/stylesheets/content/_boxes.sass b/app/assets/stylesheets/content/_boxes.sass
@@ -32,18 +32,6 @@
   line-height: 1.5em
   border: 1px solid #e4e4e4
 
-  li
-    &.filter label
-      clear: left
-      float: left
-      width: 170px
-    &.decorated
-      margin-left: 20px
-      list-style: disc outside none
-
 .box p
   padding-top: 5px
   padding-bottom: 8px
-
-#content .box h3
-  margin-top: 3px
diff --git a/app/assets/stylesheets/content/_buttons.sass b/app/assets/stylesheets/content/_buttons.sass
@@ -87,23 +87,18 @@ a.button
 
 
   &.-transparent
-    @include button-style($background: $button--font-color, $style: hollow)
-    border-color: transparent
+    background: transparent
 
-    &:hover, &:focus
-      @include varprop(border-color, button--border-color)
-
-    &.-active
-      background: $button--active-background-color
-
-      &:hover, &:focus
-        border-color: $button--active-border-color
+    &:hover, &:focus, &.-active
+      background: $button--background-hover-color
 
   &.-tiny
     @include button-size(tiny)
 
   &.-small
     @include button-size(small)
+    &.-with-icon:before
+      vertical-align: initial
 
   &.-large
     @include button-size(large)

diff --git a/app/assets/stylesheets/content/_forms.sass b/app/assets/stylesheets/content/_forms.sass
@@ -587,9 +587,6 @@ input[readonly].-clickable
   line-height: normal
   padding: rem-concat-list($select-element-padding)
 
-  &.parent-select
-    height: 100%
-
   &[multiple]
     background-image: none
     padding-right: $form-padding

diff --git a/app/assets/stylesheets/content/_modal.lsg b/app/assets/stylesheets/content/_modal.lsg
@@ -3,18 +3,14 @@
 ## Modals: Standard style
 
 ```
-<div class="modal-container">
+<div class="op-modal--modal-container">
   <div class="op-modal--modal-header">
+    <h3>Export</h3>
     <a class="op-modal--modal-close-button">
       <i class="icon-close" title="Close popup"></i>
     </a>
   </div>
-  <div class="modal-content">
-    <h3>Modal Headline</h3>
-    Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper
-  </div>
-</div><br /><br />
-<h3>Export</h3>
+  <div class="op-modal--modal-body">
     <ul class="export-options">
       <li>
         <a>
@@ -24,13 +20,13 @@
       </li>
        <li>
         <a>
-          <i class="icon-export-vnd-ms-excel icon-big"></i>
+          <i class="icon-export-xls icon-big"></i>
           <span class="export-label">XLS</span>
         </a>
       </li>
        <li>
         <a>
-          <i class="icon-export-vnd-ms-excel-descr icon-big"></i>
+          <i class="icon-export-export-xls-with-descriptions icon-big"></i>
           <span class="export-label">XLS with description</span>
         </a>
       </li>
@@ -53,6 +49,9 @@
         </a>
       </li>
     </ul>
+  </div>
+</div>
+
 ```
 
 ## Modals: Highlighted and with footer

diff --git a/app/assets/stylesheets/content/_modal.sass b/app/assets/stylesheets/content/_modal.sass
@@ -58,7 +58,7 @@ $modal-footer-height: $modal-header-height
   transition: opacity 0.25s ease
   background: $ng-modal-background
   position: relative
-  padding: $ng-modal-padding / 2
+  padding: 5px $ng-modal-padding / 2
   min-width: 200px
   max-width: 60vw
   overflow-y: auto
@@ -74,7 +74,21 @@ $modal-footer-height: $modal-header-height
     min-height: 20vh
 
 .op-modal--modal-header
-  padding: 0
+  display: flex
+  align-items: center
+  height: $modal-header-height
+  padding: 0 45px 0 0
+  margin-bottom: 15px
+  border-bottom: 1px solid $light-gray
+
+  *
+    height: $modal-header-height
+    line-height: $modal-header-height
+
+  h2, h3
+    border: none
+    @include text-shortener
+    margin: 0
 
 .op-modal--modal-body
   margin: 1em 0
@@ -95,8 +109,8 @@ $modal-footer-height: $modal-header-height
 
 .op-modal--modal-close-button
   position: absolute
-  top: 0.75rem
-  right: 0.75rem
+  right: 25px
+  top: 4px
   cursor: pointer
   @include varprop(color, body-font-color)
   &:hover
@@ -109,32 +123,19 @@ $modal-footer-height: $modal-header-height
 
   // Overridden header styles
   .op-modal--modal-header
-    display: flex
-    align-items: center
-    height: $modal-header-height
-    padding: 0 45px 0 1.5rem
-    border-bottom-style: solid
+    padding-left: 1.5rem
     @include varprop(background-color, header-bg-color)
     @include varprop(border-bottom-width, header-border-bottom-width)
     @include varprop(border-bottom-color, header-border-bottom-color)
 
     *
       @include varprop(color, header-item-font-color)
-      height: $modal-header-height
-      line-height: $modal-header-height
-
-    h2, h3
-      @include text-shortener
-      margin: 0
-      border: none
 
   .op-modal--modal-footer
     margin: 1em 0
 
   .op-modal--modal-close-button
-    right: 10px
     top: 0
-    @include varprop(line-height, modal-header-height)
     @include varprop(color, header-item-font-color)
 
   .avatar

diff --git a/app/assets/stylesheets/content/editor/_ckeditor.sass b/app/assets/stylesheets/content/editor/_ckeditor.sass
@@ -119,6 +119,8 @@ label.todo-list__label
   margin-bottom: 0
   display: initial
   font-size: initial
+  float: left
+  width: 0
 
   > input
     margin-top: 0
@@ -128,6 +130,7 @@ label.todo-list__label
   margin-bottom: 0
   li
     list-style: none
+    word-break: break-word
 
 .ck-editor__editable[dir="rtl"]
   ol, ul

diff --git a/app/assets/stylesheets/content/editor/_markdown.sass b/app/assets/stylesheets/content/editor/_markdown.sass
@@ -23,26 +23,15 @@ div.ck-editor__preview
 
   ul.task-list
     list-style: none
-    margin-left: 25px
+    margin-left: 40px
 
     .task-list-item
-      display: flex
-      flex-wrap: wrap
-      white-space: pre-wrap
-
+      *
+        vertical-align: top
       input
         height: 25px
-        margin-right: 5px
-
-      // Ensure nested task lists are wrapped
-      // by making nested lists 100% row width
-      ul.task-list
-        flex-basis: 100%
-        white-space: nowrap
-
-  // remove indentation of top-level task-list
-  > ul.task-list
-    margin-left: 0
+        position: absolute
+        margin-left: -25px
 
   // Style tables within figure.table
   figure.table

diff --git a/app/assets/stylesheets/content/work_packages/inplace_editing/_display_fields.sass b/app/assets/stylesheets/content/work_packages/inplace_editing/_display_fields.sass
@@ -47,6 +47,9 @@
 
   &.-placeholder
     font-style: italic
+    display: inline-block
+    min-width: 100px
+    vertical-align: middle
 
   // Always render custom options as inline
   // when only one line
@@ -90,12 +93,13 @@
     padding: 0 2px
 
 .wp-table--cell-container
+  .inline-edit--display-field.-placeholder,
   &.estimatedTime
     width: 100%
 
     .-placeholder
       @include wp-table--placeholder-time-values
-      
+
 // Sums in wp table
 .wp-table--sum-container
   .split-time-field

diff --git a/app/assets/stylesheets/content/work_packages/tabs/_activities.sass b/app/assets/stylesheets/content/work_packages/tabs/_activities.sass
@@ -65,7 +65,6 @@
 
 .comment ul
   list-style-type: disc !important
-  margin: 10px 0 0 12px !important
 
   li
     padding: 0 !important
@@ -77,7 +76,7 @@ h4.comment
 
 .work-package-details-activities-list
   list-style-type: none
-  margin: 0
+  margin: 35px 0 0 0
 
 // Position first date with comment toggler
 .activity-date.-with-toggler

diff --git a/app/assets/stylesheets/content/work_packages/tabs/_relations.sass b/app/assets/stylesheets/content/work_packages/tabs/_relations.sass
@@ -129,10 +129,4 @@
 
   .wp-relations-input-section
     margin-right: 10px
-    flex: 1
-
-.detail-panel--relations
-  .panel-toggler .icon-small
-    height: 18px
-    display: inline-block
-    vertical-align: middle
+    flex: 1
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
@@ -63,9 +63,11 @@ def logout
     # Keep attributes from the session
     # to identify the user
     previous_session = session.to_h.with_indifferent_access
+    previous_user = current_user
+
     logout_user
 
-    perform_post_logout previous_session
+    perform_post_logout previous_session, previous_user
   end
 
   # Enable user to choose a new password

diff --git a/app/controllers/concerns/accounts/current_user.rb b/app/controllers/concerns/accounts/current_user.rb
@@ -103,13 +103,25 @@ def logout_user
   end
 
   # Redirect the user according to the logout scheme
-  def perform_post_logout(_prev_session)
+  def perform_post_logout(prev_session, prev_user)
+    # First, check if there is an SLO callback for a given
+    # omniauth provider of the user
+    provider = ::OpenProject::Plugins::AuthPlugin.login_provider_for(prev_user)
+    if provider && (callback = provider[:single_sign_out_callback])
+      instance_exec prev_session, prev_user, &callback
+      return if performed?
+    end
+
+    # Otherwise, if there is an omniauth direct login
+    # and we're not logging out globablly, ensure the
+    # user does not get re-logged in
     if Setting.login_required? && omniauth_direct_login?
       flash.now[:notice] = I18n.t :notice_logged_out
       render :exit, locals: { instructions: :after_logout }
-    else
-      redirect_to home_url
+      return
     end
+
+    redirect_to(home_url) unless performed?
   end
 
   # Login the current user