Release OpenProject 12.1.1

Author: oliverguenther

app/models/queries/queries.rb

@@ -34,7 +34,6 @@ module Queries::Queries
   ::Queries::Register.register(QueryQuery) do
     filter Filters::ProjectFilter
     filter Filters::ProjectIdentifierFilter
-    filter Filters::HiddenFilter
     filter Filters::UpdatedAtFilter
     filter Filters::IdFilter
   end

app/models/queries/queries/filters/hidden_filter.rb

@@ -325,15 +325,20 @@ def self.deserialize(name, value)
     definition = Settings::Definition[name]
 
     if definition.serialized? && value.is_a?(String)
-      YAML::safe_load(value, permitted_classes: [Symbol, ActiveSupport::HashWithIndifferentAccess, Date, Time])
-        .tap { |maybe_hash| maybe_hash.try(:deep_stringify_keys!) }
+      YAML::safe_load(value, permitted_classes: [Symbol, ActiveSupport::HashWithIndifferentAccess, Date, Time, URI::Generic])
+        .tap { |maybe_hash| normalize_hash!(maybe_hash) if maybe_hash.is_a?(Hash) }
     elsif value != '' && !value.nil?
       read_formatted_setting(value, definition.format)
     else
       definition.format == :string ? value : nil
     end
   end
 
+  def self.normalize_hash!(hash)
+    hash.deep_stringify_keys!
+    hash.deep_transform_values! { |v| v.is_a?(URI::Generic) ? v.to_s : v }
+  end
+
   def self.read_formatted_setting(value, format)
     case format
     when :boolean

app/models/setting.rb

@@ -30,7 +30,8 @@ See COPYRIGHT and LICENSE files for more details.
 <% permissions.each do |mod, mod_permissions| %>
   <% global_prefix = show_global_role ? 'fieldset--global--' : 'fieldset--' %>
   <% module_name = mod.blank? ? 'fieldset--global--' + Project.model_name.human.downcase.gsub(' ', '_') : global_prefix + l_or_humanize(mod, prefix: 'project_module_').downcase.gsub(' ', '_') %>
-  <fieldset class="form--fieldset -collapsible" id="<%= module_name %>">
+  <% module_id = module_name.parameterize  %>
+  <fieldset class="form--fieldset -collapsible" id="<%= module_id %>">
     <legend class="form--fieldset-legend">
       <% if mod.blank? %>
         <%= show_global_role ? t(:label_global) : Project.model_name.human %>
@@ -40,7 +41,7 @@ See COPYRIGHT and LICENSE files for more details.
     </legend>
     <div class="form--toolbar">
       <span class="form--toolbar-item">
-        (<%= check_all_links module_name %>)
+        (<%= check_all_links module_id %>)
       </span>
     </div>
     <div class="-columns-2">

app/views/roles/_permissions.html.erb

@@ -138,6 +138,9 @@ class << self
       #  Will serve to be validated against. A lambda can be provided returning an array in case
       #  the array needs to be evaluated dynamically. In case of e.g. boolean format, setting
       #  an allowed array is not necessary.
+      # @param [nil] env_alias Alternative for the default env name to also look up. E.g. with the alias set to
+      #  `OPENPROJECT_2FA` for a definition with the name `two_factor_authentication`, the value is fetched
+      #  from the ENV OPENPROJECT_2FA as well.
       def add(name,
               value:,
               format: nil,
@@ -345,7 +348,9 @@ def env_name_unprefixed(definition)
       end
 
       def env_name_alias(definition)
-        "#{ENV_PREFIX}#{definition.env_alias.upcase}" if definition.env_alias
+        return unless definition.env_alias
+
+        definition.env_alias.upcase
       end
 
       ##

config/constants/settings/definition.rb

@@ -96,7 +96,7 @@
       writable: false
 
   add :auth_source_sso,
-      format: :string,
+      format: :hash,
       value: nil,
       writable: false
 
@@ -347,11 +347,13 @@
   add :email_delivery_configuration,
       value: 'inapp',
       allowed: %w[inapp legacy],
-      writable: false
+      writable: false,
+      env_alias: 'EMAIL_DELIVERY_CONFIGURATION'
 
   add :email_delivery_method,
       format: :symbol,
-      value: nil
+      value: nil,
+      env_alias: 'EMAIL_DELIVERY_METHOD'
 
   add :emails_footer,
       value: {
@@ -802,9 +804,16 @@
       value: true,
       writable: false
 
+  add :smtp_authentication,
+      format: :string,
+      value: 'plain',
+      writable: false,
+      env_alias: 'SMTP_AUTHENTICATION'
+
   add :smtp_enable_starttls_auto,
       format: :boolean,
-      value: false
+      value: false,
+      env_alias: 'SMTP_ENABLE_STARTTLS_AUTO'
 
   add :smtp_openssl_verify_mode,
       format: :string,
@@ -814,32 +823,33 @@
 
   add :smtp_ssl,
       format: :boolean,
-      value: false
+      value: false,
+      env_alias: 'SMTP_SSL'
 
   add :smtp_address,
       format: :string,
-      value: ''
+      value: '',
+      env_alias: 'SMTP_ADDRESS'
 
   add :smtp_domain,
       format: :string,
-      value: 'your.domain.com'
+      value: 'your.domain.com',
+      env_alias: 'SMTP_DOMAIN'
 
   add :smtp_user_name,
       format: :string,
-      value: ''
+      value: '',
+      env_alias: 'SMTP_USER_NAME'
 
   add :smtp_port,
       format: :integer,
-      value: 587
+      value: 587,
+      env_alias: 'SMTP_PORT'
 
   add :smtp_password,
       format: :string,
-      value: ''
-
-  add :smtp_authentication,
-      format: :string,
-      value: 'plain',
-      writable: false
+      value: '',
+      env_alias: 'SMTP_PASSWORD'
 
   add :software_name,
       value: 'OpenProject'

config/constants/settings/definitions.rb

@@ -238,7 +238,7 @@ lt:
           text: >
             OpenProject Enterprise Edition yra pastatyta virš Community Edition. Papildomai įdėtos „premium“ savybės ir profesionalus aptarnavimas, pagrinde orientuotas į organizacijas su daugiau nei 10 vartotojų, kurie naudodami OpenProject valdo verslui kritinius projektus.
           unlimited: "Neribota"
-          you_contribute: "Developers need to pay their bills, too. By upgrading to the Enterprise Edition, you will be supporting this open source community effort and contributing to its development, maintenance and continuous improvement."
+          you_contribute: "Vystotojams taip pat reikia apmokėti sąskaitas. Pereidami į „Enterprise Edition“, jūs paremsite šį atviro kodo bendruomenės projektą ir prisidėsite prie jo vystymo, palaikymo ir pastovaus tobulinimo."
     custom_actions:
       date:
         specific: 'įjungta'
@@ -297,7 +297,7 @@ lt:
               new_features_html: >
                 Laidoje yra kelios naujos savybės ir patobulinimai: <br> <ul class="%{list_styling_class}"> <li>BCF modulyje jūs dabar galite įrašyti savo parinktus darbų paketų filtrus, stulpelius ir pan. kaip <b>vaizdus</b> ir dalintis jais su savo komandos nariais.</li> <li><b>Komandos plano modulis</b> (Enterprise savybė) leidžia jums vizualiai priskirti užduotis komandos nariams, gauti apžvalgą kas ką daro.</li> <li>Mes <b>išleidžiame bazines agile lentas</b> bendruomenės versijai.</li> <li><b>Filtras „Įtraukti projektus“</b> palengvina pridėti skirtingus projektus į jūsų vaizdus, tokius kaip darbų paketai, kalendoriai ar komandų planai.</li> <li>Mes darbo paketų detalėse pridėjom <b>naują kortelę „Failai“</b>, kurioje bus visa įmanoma informacija apie prie darbo paketo prisegtą informaciją.</li> <li>Mes sukūrėme <b>grupėms globalius vaidmenis</b>, kuriuos galima priskirti grupėms ir sukurti supernaudotojų grupes.</li> <li>Projekto būseną dabar galima nustatyti iš platesnio reikšmių pasirinkimo.</li> </ul>
     label_activate: "Aktyvuoti"
-    label_assignee: 'Assignee'
+    label_assignee: 'Paskirtas'
     label_add_column_after: "Pridėti stulpelį po"
     label_add_column_before: "Pridėti stulpelį prieš"
     label_add_columns: "Pridėti stulpelių"
@@ -1155,7 +1155,7 @@ lt:
       role:
         label: 'Vaidmuo projekte %{project}'
         no_roles_found: 'Nerasta jokių vaidmenų'
-        description: 'This is the role that %{principal} will receive when they join your project. The role defines which actions they are allowed to take and which information they are allowed to see. <a href="https://www.openproject.org/docs/system-admin-guide/users-permissions/roles-permissions/#roles-and-permissions" target="_blank"> Learn more about roles and permissions. </a>'
+        description: 'Tai yra vaidmuo, kurį %{principal} gaus, kai prisijungs prie jūsų projekto. Vaidmuo nurodo, kokius veiksmus leidžiama atlikti ir kokią informaciją galima matyti. <a href="https://www.openproject.org/docs/system-admin-guide/users-permissions/roles-permissions/#roles-and-permissions" target="_blank"> Sužinokite daugiau apie vaidmenis ir teises. </a>'
         required: 'Prašome parinkti vaidmenį'
         next_button: 'Kitas'
       message:

config/locales/crowdin/js-lt.yml

@@ -2191,7 +2191,7 @@ lt:
   permission_comment_news: "Komentuoti naujienas"
   permission_commit_access: "Skaitymo/rašymo prieiga į repozitoriją"
   permission_copy_projects: "Kopijuoti projekus"
-  permission_create_backup: "Create backup"
+  permission_create_backup: "Kurti atsarginę kopiją"
   permission_delete_work_package_watchers: "Pašalinti stebėtojus"
   permission_delete_work_packages: "Pašalinti darbų paketus"
   permission_delete_messages: "Pašalinti pranešimus"
@@ -2284,7 +2284,7 @@ lt:
     assigned_to_role: "Priskirtojo asmens vaidmuo"
     member_of_group: "Priskirtojo asmens grupė"
     assignee_or_group: "Paskirtas ar priklausanti grupė"
-    subproject_id: "Including subproject"
+    subproject_id: "Įtraukti sub-projektus"
     only_subproject_id: "Tik sub-projektai"
     name_or_identifier: "Pavadinimas arba identifikatorius"
   repositories:

config/locales/crowdin/lt.yml

@@ -25,6 +25,10 @@ curl -s https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${A
 wget --quiet -O- https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
 echo "deb http://apt.postgresql.org/pub/repos/apt buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list
 
+# sources for dotnet runtime
+wget -qO- https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
+wget -qO /etc/apt/sources.list.d/microsoft.list https://packages.microsoft.com/config/debian/10/prod.list
+
 apt-get update -qq
 apt-get install -y \
 	apt-transport-https \
@@ -37,16 +41,14 @@ apt-get install -y \
 	postgresql-client-9.6 \
 	postgresql-13 \
 	postgresql-client-13 \
-	imagemagick
+	imagemagick \
+	dotnet-runtime-3.1 # required for BIM edition
 
 # remove any existing cluster
 service postgresql stop
 rm -rf /var/lib/postgresql/{9.6,13}
 
 # Specifics for BIM edition
-curl 'https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh' -o ./dotnet-install.sh
-chmod +x dotnet-install.sh
-./dotnet-install.sh -c 3.1
 
 tmpdir=$(mktemp -d)
 cd $tmpdir

docker/prod/setup/preinstall-common.sh

@@ -64,7 +64,7 @@ info:
 
     ### API Key through Basic Auth
 
-    Users can authenticate towards the API v3 using basic auth with `apikey` (as a string, NOT your API key) as the user name and their API key as the password.
+    Users can authenticate towards the API v3 using basic auth with the user name `apikey` (NOT your login) and the API key as the password.
     Users can find their API key on their account page.
 
     Example: