Release OpenProject 11.0.1

.gitignore

@@ -54,6 +54,7 @@ npm-debug.log*
 /app/assets/javascripts/editor/*
 /app/assets/javascripts/locales/*.*
 /frontend/src/locales/*.js
+/modules/*/frontend/module/module
 /config/additional_environment.rb
 /config/configuration.yml
 /config/database.yml

.pkgr.yml

@@ -5,6 +5,7 @@ targets:
     build_dependencies:
       - libsqlite3-dev
     dependencies:
+      - unzip
       - poppler-utils
       - unrtf
       - tesseract-ocr
@@ -18,7 +19,8 @@ targets:
   ubuntu-20.04:
     <<: *debian9
   centos-8:
-   dependencies:
+    dependencies:
+      - unzip
       - epel-release
   centos-7:
    dependencies:
@@ -33,6 +35,7 @@ services:
 installer: https://github.com/pkgr/installer.git
 wizards:
   - https://github.com/pkgr/addon-legacy-installer.git
+  - https://github.com/opf/addon-openproject-edition.git
   - https://github.com/pkgr/addon-postgres
   - https://github.com/pkgr/addon-apache2.git
   - https://github.com/opf/addon-repositories.git

Dockerfile

@@ -23,11 +23,11 @@ ENV PGDATA=/var/openproject/pgdata
 ENV PGDATA_LEGACY=/var/lib/postgresql/9.6/main
 
 ENV DATABASE_URL=postgres://openproject:[email protected]/openproject
-ENV RAILS_SERVE_STATIC_FILES=1
-ENV HEROKU=true
 ENV RAILS_ENV=production
 ENV RAILS_CACHE_STORE=memcache
-ENV RAILS_GROUPS="production docker opf_plugins"
+ENV RAILS_GROUPS=production
+ENV RAILS_LOG_TO_STDOUT=1
+ENV RAILS_SERVE_STATIC_FILES=1
 ENV OPENPROJECT_INSTALLATION__TYPE=docker
 # Valid values are: standard,bim
 ENV OPENPROJECT_EDITION=standard

Gemfile

@@ -260,8 +260,6 @@ group :development do
 end
 
 group :development, :test do
-  gem 'thin', '~> 1.7.2'
-
   # Require factory_bot for usage with openproject plugins testing
   gem 'factory_bot', '~> 6.1.0'
   # require factory_bot_rails for convenience in core development
@@ -314,17 +312,11 @@ platforms :mri, :mingw, :x64_mingw do
   gem 'with_advisory_lock', '~> 4.6.0'
 end
 
-group :opf_plugins do
-  gem 'openproject-translations', git: 'https://github.com/opf/openproject-translations.git', branch: 'dev'
-end
-
-group :docker, optional: true do
-  gem 'passenger', '~> 6.0.1'
+gem 'openproject-translations',
+  git: 'https://github.com/opf/openproject-translations.git',
+  branch: 'dev'
 
-  # Used to easily precompile assets
-  gem 'newrelic_rpm', '~> 6.9.0.363', require: !!ENV['HEROKU']
-  gem 'rails_12factor', require: !!ENV['HEROKU']
-end
+gem 'newrelic_rpm', '~> 6.9.0.363'
 
 # Load Gemfile.local, Gemfile.plugins, plugins', and custom Gemfiles
 gemfiles = Dir.glob File.expand_path('../{Gemfile.plugins,Gemfile.modules,Gemfile.local,lib/plugins/*/Gemfile}',

Gemfile.lock

@@ -666,9 +666,6 @@ GEM
       parallel
     parser (2.7.1.4)
       ast (~> 2.4.1)
-    passenger (6.0.6)
-      rack
-      rake (>= 0.8.1)
     pdf-core (0.8.1)
     pdf-inspector (1.3.0)
       pdf-reader (>= 1.0, < 3.0.a)
@@ -716,7 +713,7 @@ GEM
       eventmachine_httpserver
       http_parser.rb (~> 0.6.0)
       multi_json
-    puma (5.0.0)
+    puma (5.0.2)
       nio4r (~> 2.0)
     rack (2.2.3)
     rack-accept (0.4.5)
@@ -767,11 +764,6 @@ GEM
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
-    rails_12factor (0.0.3)
-      rails_serve_static_assets
-      rails_stdout_logging
-    rails_serve_static_assets (0.0.5)
-    rails_stdout_logging (0.0.5)
     railties (6.0.3.4)
       actionpack (= 6.0.3.4)
       activesupport (= 6.0.3.4)
@@ -914,10 +906,6 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     test-prof (0.12.2)
-    thin (1.7.2)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
@@ -1073,7 +1061,6 @@ DEPENDENCIES
   openproject-xls_export!
   overviews!
   parallel_tests (~> 3.1)
-  passenger (~> 6.0.1)
   pg (~> 1.2.2)
   plaintext (~> 0.3.2)
   posix-spawn (~> 0.3.13)
@@ -1094,7 +1081,6 @@ DEPENDENCIES
   rails (~> 6.0.3.2)
   rails-controller-testing (~> 1.0.2)
   rails-i18n (~> 6.0.0)
-  rails_12factor
   rdoc (>= 2.4.2)
   reporting_engine!
   request_store (~> 1.5.0)
@@ -1130,7 +1116,6 @@ DEPENDENCIES
   sys-filesystem (~> 1.3.3)
   table_print (~> 1.5.6)
   test-prof (~> 0.12.0)
-  thin (~> 1.7.2)
   timecop (~> 0.9.0)
   typed_dag (~> 2.0.2)
   tzinfo-data (~> 1.2020.1)

app/contracts/users/base_contract.rb

@@ -39,6 +39,7 @@ class BaseContract < ::ModelContract
     attribute :name
     attribute :mail
     attribute :admin
+    attribute :language
 
     attribute :auth_source_id
     attribute :identity_url

app/helpers/custom_styles_helper.rb

@@ -0,0 +1,47 @@
+#-- encoding: UTF-8
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2020 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See docs/COPYRIGHT.rdoc for more details.
+#++
+
+module CustomStylesHelper
+  def apply_custom_styles?(skip_ee_check: OpenProject::Configuration.bim?)
+    # Apply custom styles either if EE allows OR we are on a BIM edition with the BIM theme active.
+    CustomStyle.current.present? &&
+      (EnterpriseToken.allows_to?(:define_custom_style) || skip_ee_check)
+  end
+
+  # The default favicon and touch icons are both the same for normal OP and BIM.
+  def apply_custom_favicon?
+    apply_custom_styles?(skip_ee_check: false) && CustomStyle.current.favicon.present?
+  end
+
+  # The default favicon and touch icons are both the same for normal OP and BIM.
+  def apply_custom_touch_icon?
+    apply_custom_styles?(skip_ee_check: false) && CustomStyle.current.touch_icon.present?
+  end
+end

app/helpers/removed_js_helpers_helper.rb

@@ -42,9 +42,9 @@ def link_to_function(content, function, html_options = {})
 
   ##
   # Execute the callback on click
-  def csp_onclick(callback_str, selector)
+  def csp_onclick(callback_str, selector, prevent_default: true)
     content_for(:additional_js_dom_ready) do
-      "jQuery('#{selector}').click(function() { #{callback_str}; return false; });\n".html_safe
+      "jQuery('#{selector}').click(function() { #{callback_str}; #{prevent_default ? 'return false;' : ''} });\n".html_safe
     end
   end
 end