Merge branch 'release/7.1' into dev

app/assets/stylesheets/content/work_packages/_table_content.sass

@@ -87,6 +87,18 @@ table.generic-table tbody tr.issue .checkbox
 .wp-table--cell .ui-datepicker
   margin-left: -38%
 
+.wp-table--cell-container
+  @extend .ellipsis
+  display: block
+  // Because of the display: block the elements now
+  // take up the whole of the cell. This would block
+  // the user from using click (to select) or double-click (to open full screen)
+  // on the cell. Hence we disable events on this element but have to reenable them
+  // for the inplace-edit fields.
+  pointer-events: none
+
+  .inplace-edit
+    pointer-events: all
 
 .inplace-editing--container
   display: inline-block

app/assets/stylesheets/content/work_packages/_table_hierarchy.sass

@@ -4,6 +4,7 @@
 // collapsed: left arrow
 .wp-table--hierarchy-indicator
   @include varprop(color, body-font-color)
+  pointer-events: all
 
   &:hover
     text-decoration: none
@@ -21,9 +22,15 @@
 
 .wp-table--hierarchy-span
   text-align: end
-  display: inline-block
+  display: block
+  float: left
   margin-left: 5px
   padding-right: 8px
+  // Avoid catching double click/click events
+  // meant to open the full screen view
+  pointer-events: none
+  height: 1rem
+  // width calculation done in js code
 
 .wp-table--hierarchy-indicator-icon
   @include icon-common

app/assets/stylesheets/openproject/_plugins.scss.erb

@@ -1,5 +1,5 @@
 <% Redmine::Plugin.all.collect do |plugin| %>
   <% plugin.registered_global_assets[:css].each do |path| %>
-      @import "<%= path %>"
+      @import "<%= path %>";
   <% end %>
 <% end %>

app/views/settings/plugin.html.erb

@@ -26,12 +26,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<%= toolbar title: "#{l(:label_settings)}: #{@plugin.name}" %>
+<%= toolbar title: @plugin.name %>
 <div id="settings">
   <%= styled_form_tag({action: 'plugin'}) do %>
-    <div class="box">
-      <%= render partial: @partial, locals: {settings: @settings}%>
-    </div>
+    <%= render partial: @partial, locals: {settings: @settings}%>
     <%= styled_submit_tag l(:button_apply), class: '-highlight' %>
   <% end %>
 </div>

docs/operations/upgrading/manual/upgrading.md

@@ -1,10 +1,14 @@
-# OpenProject 6.0.x to OpenProject 6.1 Debian/Ubuntu Upgrade Guide (Manual installation)
+# OpenProject 6.x to OpenProject 7.x Debian/Ubuntu Upgrade Guide (Manual installation)
 
-Please look at the steps in the section about the upgrade to OpenProject 6.0. OpenProject 6.x is being released under the branch `stable/6`.
+Please look at the steps in the section about the upgrade to OpenProject 6.0. OpenProject 7.x is being released under the branch `stable/7`. The other steps are identical.
+
+### Frontend changes, bower is no longer required
+
+With OpenProject 7.0., we no longer depend on `bower` for some on the frontend assets. Please ensure you remove `<OpenProject root>/frontend/bower_components` and `<OpenProject root>/frontend/bower.json`.
 
 ### When running with MySQL: Required changes in sql_mode
 
-If you're upgrading to OpenProject 6.1.x with a MySQL installation, you will need to update your database.yml to reflect some necessary changes to MySQL `sql_mode` made as part of the migration to Rails 5. Please see the `config/database.yml.example` file for more information.
+If you're upgrading to OpenProject 7.x with a MySQL installation, you will need to update your database.yml to reflect some necessary changes to MySQL `sql_mode` made as part of the migration to Rails 5. Please see the `config/database.yml.example` file for more information.
 
 # OpenProject 5.0.x to OpenProject 6.0 Debian/Ubuntu Upgrade Guide
 

frontend/app/components/wp-fast-table/builders/modes/hierarchy/single-hierarchy-row-builder.ts

@@ -154,14 +154,6 @@ export class SingleHierarchyRowBuilder extends RowRefreshBuilder {
     hierarchyIndicator.classList.add(hierarchyCellClassName);
     hierarchyIndicator.style.width = indicatorWidth;
 
-    // Set the width of the container
-    if (jRow != null) {
-      jRow
-        .find('td.subject .wp-table--cell-container')
-        .css('width', `calc(100% - ${indicatorWidth})`)
-        .css('display', 'inline-block');
-    }
-
     if (workPackage.$loaded && !hasChildrenInTable(workPackage, this.workPackageTable)) {
       hierarchyIndicator.innerHTML = `
             <span tabindex="0" class="wp-table--leaf-indicator">