Release OpenProject 11.3.5

Author: oliverguenther

.env.example

@@ -33,6 +33,10 @@
 # This is used to prevent people from using the new docker-compose file for automated installs
 LOCAL_DEV_CHECK=1
 
+# Set this to your ckeditor build output directory (which includes ckeditor.js) if you
+# want to develop ckeditor locally.
+CKEDITOR_BUILD_DIR=frontend/src/vendor/ckeditor/
+
 # This is the host from which you will be accessing the development servers locally
 PUBLIC_HOST=localhost
 

Gemfile

@@ -96,6 +96,7 @@ gem 'semantic', '~> 1.6.1'
 gem 'svg-graph', '~> 2.2.0'
 
 gem 'date_validator', '~> 0.11.0'
+gem 'email_validator', '~> 2.2.3'
 gem 'ruby-duration', '~> 3.2.0'
 
 # provide compatible filesystem information for available storage

Gemfile.lock

@@ -439,6 +439,8 @@ GEM
       eventmachine (>= 1.0.0.beta.4)
     em-synchrony (1.0.6)
       eventmachine (>= 1.0.0.beta.1)
+    email_validator (2.2.3)
+      activemodel
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     erbse (0.1.4)
@@ -989,6 +991,7 @@ DEPENDENCIES
   delayed_job_active_record (~> 4.1.5)
   disposable (~> 0.4.7)
   doorkeeper (~> 5.5.0)
+  email_validator (~> 2.2.3)
   equivalent-xml (~> 0.6)
   escape_utils (~> 1.0)
   factory_bot (~> 6.2.0)

app/helpers/enterprise_trial_helper.rb

@@ -6,10 +6,13 @@ def augur_content_security_policy
   end
 
   def chargebee_content_security_policy
+    script_src = %w(js.chargebee.com)
+    default_src = script_src + ["#{OpenProject::Configuration.enterprise_chargebee_site}.chargebee.com"]
+
     append_content_security_policy_directives(
-      script_src: %w(js.chargebee.com),
-      style_src: %w(js.chargebee.com openproject-enterprise-test.chargebee.com),
-      frame_src: %w(js.chargebee.com openproject-enterprise-test.chargebee.com)
+      script_src: script_src,
+      style_src: default_src,
+      frame_src: default_src
     )
   end
 

app/models/setting.rb

@@ -285,11 +285,21 @@ def self.cached_settings
   end
 
   def self.cache_key
-    RequestStore.store[:settings_updated_at] ||= Setting.column_names.include?(:updated_at) && Setting.maximum(:updated_at)
-    most_recent_settings_change = (RequestStore.store[:settings_updated_at] || Time.now.utc).to_i
+    most_recent_settings_change = (settings_updated_at || Time.now.utc).to_i
+
     "/openproject/settings/all/#{most_recent_settings_change}"
   end
 
+  def self.settings_updated_at
+    RequestStore.store[:settings_updated_at] ||= has_updated_at_column? && Setting.maximum(:updated_at)
+  end
+
+  def self.has_updated_at_column?
+    return @has_updated_at_column unless @has_updated_at_column.nil?
+
+    @has_updated_at_column = Setting.column_names.map(&:to_sym).include?(:updated_at)
+  end
+
   def self.settings_table_exists_yet?
     # Check whether the settings table already exists. This makes plugins
     # patching core classes not break things when settings are accessed.

app/models/user.rb

@@ -112,15 +112,15 @@ def self.blocked_condition(blocked)
                         :firstname,
                         :lastname,
                         :mail,
-                        unless: Proc.new { |user| user.is_a?(AnonymousUser) || user.is_a?(DeletedUser) || user.is_a?(SystemUser) }
+                        unless: Proc.new { |user| user.builtin? }
 
   validates_uniqueness_of :login, if: Proc.new { |user| !user.login.blank? }, case_sensitive: false
   validates_uniqueness_of :mail, allow_blank: true, case_sensitive: false
   # Login must contain letters, numbers, underscores only
   validates_format_of :login, with: /\A[a-z0-9_\-@.+ ]*\z/i
   validates_length_of :login, maximum: 256
   validates_length_of :firstname, :lastname, maximum: 256
-  validates_format_of :mail, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, allow_blank: true
+  validates :mail, email: true, unless: Proc.new { |user| user.mail.blank? }
   validates_length_of :mail, maximum: 256, allow_nil: true
   validates_confirmation_of :password, allow_nil: true
   validates_inclusion_of :mail_notification, in: MAIL_NOTIFICATION_OPTIONS.map(&:first), allow_blank: true

app/views/admin/info.html.erb

@@ -54,6 +54,28 @@ See docs/COPYRIGHT.rdoc for more details.
         <span><%= @db_version %></span>
       </div>
     </div>
+    <% if OpenProject::Database.version_deprecated? %>
+      <div class="attributes-key-value--key"></div>
+      <div class="attributes-key-value--value-container">
+        <div class="attributes-key-value--value -text">
+          <strong>
+            <%= op_icon 'icon3 icon-warning' %>
+            Deprecation warning:
+          </strong>
+          <p>
+            The next major release of OpenProject will update the requirements
+            on the required PostgreSQL database version.
+            <br/>
+            Starting with OpenProject 12.0, anticipated end of 2021, PostgreSQL 13 will be required
+            to use OpenProject.
+            <br/>
+            We have prepared <%= static_link_to :postgres_13_upgrade,
+                                                label: 'upgrade guides for all installation methods' %>.
+            You can perform the upgrade ahead of the release at any time by following the guides.
+          </p>
+        </div>
+      </div>
+    <% end %>
     <% if display_security_badge_graphic? %>
       <div class="attributes-key-value--key"></div>
       <div class="attributes-key-value--value-container">
@@ -95,38 +117,38 @@ See docs/COPYRIGHT.rdoc for more details.
   </div>
 </div>
 
-<% @storage_information.each_with_index do  |(_,entries), i| %>
-<%= content_tag :h3, t(:label_storage_group, identifier: i + 1) %>
-<div class="attributes-group">
-  <div class="attributes-key-value">
-    <div class="attributes-key-value--key"><%= t(:label_storage_for) %></div>
-    <div class="attributes-key-value--value-container">
-      <div class="attributes-key-value--value -text">
+<% @storage_information.each_with_index do |(_, entries), i| %>
+  <%= content_tag :h3, t(:label_storage_group, identifier: i + 1) %>
+  <div class="attributes-group">
+    <div class="attributes-key-value">
+      <div class="attributes-key-value--key"><%= t(:label_storage_for) %></div>
+      <div class="attributes-key-value--value-container">
+        <div class="attributes-key-value--value -text">
         <span>
           <% entries[:labels].each do |l| %>
             <%= l %>
             <br/>
           <% end %>
         </span>
+        </div>
       </div>
-    </div>
-    <div class="attributes-key-value--key"><%= t(:label_storage_free_space) %></div>
-    <div class="attributes-key-value--value-container">
-      <div class="attributes-key-value--value -text">
-        <span><%= number_to_human_size(entries[:data][:free], precision: 2) %></span>
+      <div class="attributes-key-value--key"><%= t(:label_storage_free_space) %></div>
+      <div class="attributes-key-value--value-container">
+        <div class="attributes-key-value--value -text">
+          <span><%= number_to_human_size(entries[:data][:free], precision: 2) %></span>
+        </div>
       </div>
-    </div>
-    <div class="attributes-key-value--key"><%= t(:label_storage_used_space) %></div>
-    <div class="attributes-key-value--value-container">
-      <div class="attributes-key-value--value -text">
+      <div class="attributes-key-value--key"><%= t(:label_storage_used_space) %></div>
+      <div class="attributes-key-value--value-container">
+        <div class="attributes-key-value--value -text">
         <span>
           <%= number_to_human_size(entries[:data][:used], precision: 2) %>
           (<%= entries[:data][:percent_used].round(2) %> %)
         </span>
+        </div>
       </div>
     </div>
   </div>
-</div>
 <% end %>
 
 <%= call_hook(:view_admin_info_bottom) %>

app/views/enterprises/_info.html.erb

@@ -28,7 +28,7 @@ See docs/COPYRIGHT.rdoc for more details.
 ++#%>
 <% content_for :header_tags do %>
   <script src="<%= OpenProject::Static::Links.links[:chargebee][:href] %>"
-          data-cb-site="openproject-enterprise-test">
+          data-cb-site="<%= OpenProject::Configuration.enterprise_chargebee_site %>">
   </script>
 <% end %>
 
@@ -41,7 +41,7 @@ See docs/COPYRIGHT.rdoc for more details.
     <a href="#"
        class="button -highlight-inverted"
        data-cb-type="checkout"
-       data-cb-plan-id="enterprise-edition---annual-user-license">
+       data-cb-plan-id="<%= OpenProject::Configuration.enterprise_plan %>">
       <%= t('admin.enterprise.book_now') %>
     </a>
 

app/workers/application_job.rb

@@ -36,10 +36,7 @@ class ApplicationJob < ::ActiveJob::Base
   # to avoid leaking sensitive information to logs
   self.log_arguments = false
 
-  around_perform do |_job, block|
-    reload_mailer_configuration!
-    with_clean_request_store { block.call }
-  end
+  around_perform :clean_context
 
   ##
   # Return a priority number on the given payload
@@ -90,4 +87,14 @@ def with_clean_request_store
   def reload_mailer_configuration!
     OpenProject::Configuration.reload_mailer_configuration!
   end
+
+  private
+
+  def clean_context
+    with_clean_request_store do
+      reload_mailer_configuration!
+
+      yield
+    end
+  end
 end

config/locales/crowdin/ar.yml

@@ -546,6 +546,7 @@ ar:
         error_enterprise_only: "is only available in the OpenProject Enterprise Edition"
         error_unauthorized: "may not be accessed."
         error_readonly: "was attempted to be written but is not writable."
+        email: "is not a valid email address."
         empty: "لا يمكن أن تكون فارغة."
         even: "يجب أن يكون زوجي."
         exclusion: "محجوز."