Merged opf/openproject/v7.0.3 into opf/openproject-ce/stable/7

opf · Jun 29, 2017 · 14e1645 · 14e1645
2 parents 7de7cda + 100efa6
commit 14e1645
Show file tree

Hide file tree

Showing 62 changed files with 619 additions and 255 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -102,10 +102,10 @@ GIT
 
 GIT
   remote: https://github.com/opf/openproject-translations.git
-  revision: 8444a411240546e5abd36319bf4c627f71c7763c
+  revision: 04af925b27f647bb45c23244d5d40e5f27d81761
   branch: stable/7
   specs:
-    openproject-translations (7.0.2)
+    openproject-translations (7.0.3)
       crowdin-api (~> 0.4.1)
       mixlib-shellout (~> 2.1.0)
       rails (~> 5.0.0)
@@ -140,67 +140,67 @@ GIT
 PATH
   remote: vendored-plugins/openproject-auth_plugins
   specs:
-    openproject-auth_plugins (7.0.2)
+    openproject-auth_plugins (7.0.3)
       omniauth (~> 1.0)
       rails (~> 5.0)
 
 PATH
   remote: vendored-plugins/openproject-backlogs
   specs:
-    openproject-backlogs (7.0.2)
+    openproject-backlogs (7.0.3)
       acts_as_silent_list (~> 3.0.0)
-      openproject-pdf_export (= 7.0.2)
+      openproject-pdf_export (= 7.0.3)
       rails (~> 5.0.0)
 
 PATH
   remote: vendored-plugins/openproject-costs
   specs:
-    openproject-costs (7.0.2)
+    openproject-costs (7.0.3)
       rails (~> 5.0.0)
 
 PATH
   remote: vendored-plugins/openproject-documents
   specs:
-    openproject-documents (7.0.2)
+    openproject-documents (7.0.3)
       rails (~> 5.0.0)
 
 PATH
   remote: vendored-plugins/openproject-github_integration
   specs:
-    openproject-github_integration (7.0.2)
-      openproject-webhooks (~> 7.0.2)
+    openproject-github_integration (7.0.3)
+      openproject-webhooks (~> 7.0.3)
       rails (~> 5.0)
 
 PATH
   remote: vendored-plugins/openproject-global_roles
   specs:
-    openproject-global_roles (7.0.2)
+    openproject-global_roles (7.0.3)
       rails (~> 5.0.0)
 
 PATH
   remote: vendored-plugins/openproject-local_avatars
   specs:
-    openproject-local_avatars (7.0.2)
+    openproject-local_avatars (7.0.3)
       rails (~> 5.0)
       rmagick (~> 2.15.4)
 
 PATH
   remote: vendored-plugins/openproject-meeting
   specs:
-    openproject-meeting (7.0.2)
+    openproject-meeting (7.0.3)
       icalendar (~> 2.3.0)
       rails (~> 5.0.0)
 
 PATH
   remote: vendored-plugins/openproject-my_project_page
   specs:
-    openproject-my_project_page (7.0.2)
+    openproject-my_project_page (7.0.3)
       rails (~> 5.0.0)
 
 PATH
   remote: vendored-plugins/openproject-openid_connect
   specs:
-    openproject-openid_connect (7.0.2)
+    openproject-openid_connect (7.0.3)
       lobby_boy (~> 0.1)
       omniauth-openid_connect-providers (~> 0.1)
       openproject-auth_plugins (~> 7.0)
@@ -209,36 +209,36 @@ PATH
 PATH
   remote: vendored-plugins/openproject-pdf_export
   specs:
-    openproject-pdf_export (7.0.2)
+    openproject-pdf_export (7.0.3)
       prawn (~> 2.2)
       rails (~> 5.0.0)
 
 PATH
   remote: vendored-plugins/openproject-reporting
   specs:
-    openproject-reporting (7.0.2)
+    openproject-reporting (7.0.3)
       jquery-tablesorter (~> 1.22.3)
-      openproject-costs (= 7.0.2)
+      openproject-costs (= 7.0.3)
       rails (~> 5.0.0)
       reporting_engine (>= 1.1.0)
 
 PATH
   remote: vendored-plugins/openproject-webhooks
   specs:
-    openproject-webhooks (7.0.2)
+    openproject-webhooks (7.0.3)
       rails (~> 5.0)
 
 PATH
   remote: vendored-plugins/openproject-xls_export
   specs:
-    openproject-xls_export (7.0.2)
+    openproject-xls_export (7.0.3)
       rails (~> 5.0.0)
       spreadsheet (~> 0.8.9)
 
 PATH
   remote: vendored-plugins/reporting_engine
   specs:
-    reporting_engine (7.0.2)
+    reporting_engine (7.0.3)
       json
       rails (~> 5.0.0)
 

diff --git a/app/assets/stylesheets/content/_autocomplete.sass b/app/assets/stylesheets/content/_autocomplete.sass
@@ -88,7 +88,7 @@ div.autocomplete
   &.-inplace
     position: relative
     border: none
-    padding-top: 15px
+    margin-top: 15px
     line-height: 1.6
     font-size: 1rem
 

diff --git a/app/assets/stylesheets/content/work_packages/single_view/_single_view.sass b/app/assets/stylesheets/content/work_packages/single_view/_single_view.sass
@@ -159,3 +159,22 @@ i
 
   &:before
     @include varprop(color, $body-font-color)
+
+
+// Implement two column layout for WP full screen view
+@media screen and (min-width: 90rem)
+  .action-show .attributes-group,
+  .full-create .attributes-group
+    .-columns-2
+      column-count: 2
+      column-gap: 4rem
+
+      .attributes-key-value
+        -webkit-column-break-inside: avoid
+        page-break-inside: avoid
+        break-inside: avoid
+
+        // Let some elements still span both columns
+        &.-span-all-columns
+          column-span: all
+
diff --git a/app/assets/stylesheets/layout/_toolbar.sass b/app/assets/stylesheets/layout/_toolbar.sass
@@ -248,6 +248,7 @@
     display: block
   .search-query-wrapper
     padding: 15px
+    overflow: hidden
   .query-select-dropdown--no-results
     padding: 15px 15px 0
   .ui-menu-item
@@ -272,6 +273,9 @@
     top:   24px
     right: 22px
     color: #999999
+  .ui-widget-content.-inplace
+    max-height: 55vh
+    overflow-x: auto
 
   input[type="search"]::-webkit-search-cancel-button
     display: none

diff --git a/app/assets/stylesheets/layout/_work_package_table.sass b/app/assets/stylesheets/layout/_work_package_table.sass
@@ -241,20 +241,3 @@
       overflow: overlay
     #content
       overflow-y: auto
-
-// Implement two column layout for WP full screen view
-@media screen and (min-width: 90rem)
-  .action-show .attributes-group,
-  .full-create .attributes-group
-    .-columns-2
-      column-count: 2
-      column-gap: 4rem
-
-      .attributes-key-value
-        -webkit-column-break-inside: avoid
-        page-break-inside: avoid
-        break-inside: avoid
-
-
-
-
diff --git a/app/assets/stylesheets/openproject/_plugins.scss.erb b/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 %>
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -42,6 +42,7 @@ class ApplicationController < ActionController::Base
   include I18n
   include Redmine::I18n
   include HookHelper
+  include ::OpenProject::Authentication::SessionExpiry
 
   layout 'base'
 
@@ -675,13 +676,7 @@ def stop_if_feeds_disabled
   private
 
   def session_expired?
-    !api_request? && current_user.logged? &&
-      (session_ttl_enabled? && (session[:updated_at].nil? ||
-                               (session[:updated_at] + Setting.session_ttl.to_i.minutes) < Time.now))
-  end
-
-  def session_ttl_enabled?
-    Setting.session_ttl_enabled? && Setting.session_ttl.to_i >= 5
+    !api_request? && current_user.logged? && session_ttl_expired?
   end
 
   def permitted_params

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
@@ -435,6 +435,10 @@ def graph_commits_per_author(repository)
     )
     graph.burn
   end
+
+  def login_back_url_params
+    params.permit(:path)
+  end
 end
 
 class Date

diff --git a/app/models/queries/work_packages/filter/watcher_filter.rb b/app/models/queries/work_packages/filter/watcher_filter.rb
@@ -101,7 +101,7 @@ def where_self_watcher(user_id)
         (SELECT #{db_table}.watchable_id
          FROM #{db_table}
          WHERE #{db_table}.watchable_type='WorkPackage'
-         AND #{::Queries::Operators::Equals.sql_for_field [user_id], db_table, db_field}
+         AND #{::Queries::Operators::Equals.sql_for_field [user_id], db_table, db_field})
     SQL
   end
 

diff --git a/app/models/work_package.rb b/app/models/work_package.rb
@@ -252,7 +252,7 @@ def self.event_url
   # after the wp is created.
   # As after_create is run before after_save, and journal creation is triggered by an
   # after_save hook, we rely on after_save and a specific version here.
-  after_save :reload_lock_and_timestamps, if: Proc.new { |wp| wp.lock_version == 0 }
+  after_save :reload_lock_and_timestamps, if: Proc.new { |wp| wp.lock_version.zero? }
 
   def self.done_ratio_disabled?
     Setting.work_package_done_ratio == 'disabled'
@@ -286,11 +286,10 @@ def copy_from(arg, options = {})
     # attributes don't come from form, so it's safe to force assign
     self.attributes = work_package.attributes.dup.except(*merged_options[:exclude])
     self.parent_id = work_package.parent_id if work_package.parent_id
-    self.custom_field_values =
-      work_package.custom_field_values.inject({}) do |h, v|
-        h[v.custom_field_id] = work_package.custom_value_for(v.custom_field_id)
-        h
-      end
+    self.custom_field_values = work_package
+                               .custom_values
+                               .map { |cv| [cv.custom_field_id, cv.value] }
+                               .to_h
     self.status = work_package.status
 
     work_package.watchers.each do |watcher|

diff --git a/app/views/work_packages/bulk/destroy.html.erb b/app/views/work_packages/bulk/destroy.html.erb
@@ -81,11 +81,10 @@ See doc/COPYRIGHT.rdoc for more details.
             concat content_tag :i, '', class: 'button--icon icon-delete'
             concat content_tag :span, l(:button_delete), class: 'button--text'
             end %>
-      <%= link_to project_work_packages_path(@project),
-          title: l(:button_cancel),
-          class: 'button -with-icon icon-cancel' do %>
-            <%= l(:button_cancel) %>
-          <% end %>
+      <%= link_to_function l(:button_cancel),
+                           "history.back()",
+                           title: l(:button_cancel),
+                           class: 'button -with-icon icon-cancel'%>
   </section>
 
 <% end %>
diff --git a/config/additional_boot.rb.example b/config/additional_boot.rb.example
@@ -0,0 +1,8 @@
+# Copy this file to additional_boot.rb and add any statements
+# that should run prior to Rails booting.
+#
+# Example:
+#
+# Silence Hashie warnings in OpenProject 7.0.x
+# require 'hashie'
+# Hashie.logger = Logger.new(nil)
diff --git a/config/boot.rb b/config/boot.rb
@@ -29,4 +29,11 @@
 
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
+# Load any local boot extras that is kept out of source control
+# (e.g., silencing of deprecations)
+if File.exists?(File.join(File.dirname(__FILE__), 'additional_boot.rb'))
+  instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_boot.rb'))
+end
+
+
 require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/routes.rb b/config/routes.rb
@@ -348,7 +348,8 @@
 
       get '(/revisions/:rev)(/*path)', action: :show,
                                        format: false,
-                                       rev: /[a-z0-9\.\-_]+/
+                                       rev: /[a-z0-9\.\-_]+/,
+                                       as: 'show_revisions_path'
     end
   end
 

diff --git a/docker-compose.pullpreview.yml b/docker-compose.pullpreview.yml
@@ -18,7 +18,7 @@ worker: &ruby
     - db
   environment:
     - "RAILS_CACHE_STORE=file_store"
-    - "DATABASE_URL=postgresql://app:p4ssw0rd@db:5432/app?encoding=utf8&pool=5&timeout=5000"
+    - "DATABASE_URL=postgresql://app:p4ssw0rd@db:5432/app?encoding=utf8&pool=5&timeout=5000&reconnect=true"
     - "SECRET_KEY_BASE=d4e74f017910ac56c6ebad01165b7e1b37f4c9c02e9716836f8670cdc8d65a231e64e4f6416b19c8"
     - "RAILS_ENV=production"
     - "HEROKU=true"

diff --git a/docs/configuration/incoming-emails.md b/docs/configuration/incoming-emails.md
@@ -9,7 +9,14 @@ Receiving emails is done via a rake task that fetches emails from an email serve
 ### IMAP
 
 The rake task `redmine:email:receive_imap` fetches emails via IMAP and parses them.
-Example:
+
+**Packaged installation**
+
+```bash
+openproject run bundle exec rake redmine:email:receive_imap host='imap.gmail.com' username='test_user' password='password' port=993 ssl=true allow_override=type,project project=test_project
+```
+
+**Manual installation**
 
 ```bash
 bundle exec rake redmine:email:receive_imap host='imap.gmail.com' username='test_user' password='password' port=993 ssl=true allow_override=type,project project=test_project
@@ -42,7 +49,14 @@ Available arguments that change how the work packages are handled:
 ### POP3
 
 The rake task `redmine:email:receive_pop3` fetches emails via IMAP and parses them.
-Example:
+**Packaged installation**
+
+```bash
+openproject run bundle exec rake redmine:email:receive_imap host='imap.gmail.com' username='test_user' password='password' port=993 ssl=true allow_override=type,project project=test_project
+```
+
+**Manual installation**
+
 ```bash
 bundle exec rake redmine:email:receive_pop3 host='pop.gmail.com' username='test_user' password='password' port=995 allow_override=priority
 ```

diff --git a/docs/installation/manual/README.md b/docs/installation/manual/README.md
@@ -1,6 +1,9 @@
-# Manual installation of OpenProject 6.1 with Apache on Ubuntu 14.04. LTS
+# Manual installation of OpenProject 7.0 with Apache on Ubuntu 14.04. LTS
 
-This tutorial helps you to deploy OpenProject 6.1. Please, aware that:
+**IMPORTANT: We strongly recommend to use the [OpenProject installers](https://www.openproject.org/download-and-installation) (packaged installation). There is no real advantage installing OpenProject manually.**
+
+
+This tutorial helps you to deploy OpenProject 7.0. Please, aware that:
 
 This guide requires that you have a clean Ubuntu 14.04 x64 installation
 with administrative rights. We have tested the installation guide on an
@@ -144,7 +147,7 @@ with OpenProject. For more information, see https://github.com/opf/openproject-c
 
 ```bash
 [openproject@host] cd ~
-[openproject@host] git clone https://github.com/opf/openproject-ce.git --branch stable/6 --depth 1
+[openproject@host] git clone https://github.com/opf/openproject-ce.git --branch stable/7 --depth 1
 [openproject@host] cd openproject-ce
 [openproject@host] gem install bundler
 [openproject@host] bundle install --deployment --without postgres sqlite development test therubyracer docker
@@ -259,7 +262,7 @@ Then, we prepare apache and passenger:
 
 ```bash
 [root@host] apt-get install -y apache2 libcurl4-gnutls-dev      \
-                               apache2-threaded-dev libapr1-dev \
+                               apache2-dev libapr1-dev \
                                libaprutil1-dev
 [root@ubuntu] chmod o+x "/home/openproject"
 ```