From 4d7d1cb791ddc27e453d68f694aac121e5831aa6 Mon Sep 17 00:00:00 2001 From: ulferts Date: Fri, 15 Jan 2021 09:44:37 +0100 Subject: [PATCH 1/4] prevent css styles of form--section to affect table (#8926) In the summary page, the report tables are wrapped within a div with the form--section class even though those reports are not actually part of a from. Ideally, a new class would be styled containing only the desired css rules. But as the view is deemed to be replaced anyway, the quick and dirty way is to simply take the table out of the form--field's dom structure --- app/views/work_packages/reports/_report_category.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/work_packages/reports/_report_category.html.erb b/app/views/work_packages/reports/_report_category.html.erb index bde51c2f21..4baa727948 100644 --- a/app/views/work_packages/reports/_report_category.html.erb +++ b/app/views/work_packages/reports/_report_category.html.erb @@ -36,6 +36,6 @@ See docs/COPYRIGHT.rdoc for more details. title: t(:text_analyze, subject: WorkPackage.human_attribute_name(report.report_type)), class: 'no-decoration-on-hover') %> - <%= render partial: 'report', locals: { report: report } %> -
+ +<%= render partial: 'report', locals: { report: report } %> From 97ec6c3656f194715e8ca4b525345bba8eedd5d9 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Fri, 15 Jan 2021 09:35:13 +0000 Subject: [PATCH 2/4] update locales from crowdin [ci skip] --- config/locales/crowdin/js-ru.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/crowdin/js-ru.yml b/config/locales/crowdin/js-ru.yml index 114f9b9797..691a1daa40 100644 --- a/config/locales/crowdin/js-ru.yml +++ b/config/locales/crowdin/js-ru.yml @@ -272,11 +272,11 @@ ru: standard: learn_about_link: https://www.openproject.org/openproject-11-1-release current_new_feature_html: > - The release contains various new features and improvements:
+ Релиз содержит различные новые функции и улучшения:
bim: learn_about_link: https://www.openproject.org/openproject-11-0-release current_new_feature_html: > - The release contains various new features and improvements:
+ Релиз содержит различные новые функции и улучшения:
label_activate: "Активировать" label_add_column_after: "Добавить столбец после" label_add_column_before: "Добавить столбец перед" From 4e21801ef550e705b404654717967ef0237ff7f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 18 Jan 2021 10:19:17 +0100 Subject: [PATCH 3/4] Do not include global roles in memberships list (#8931) With a user and a global role set, the users/show method will fail as it tries to render a project for every membership. --- app/controllers/users_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index fe35ebdfcf..a79768f5b2 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -74,6 +74,7 @@ class UsersController < ApplicationController def show # show projects based on current user visibility @memberships = @user.memberships + .where.not(project_id: nil) .visible(current_user) events = Activities::Fetcher.new(User.current, author: @user).events(nil, nil, limit: 10) From abe024ec7fe3ffcbe7d8017dcc60833cccffcba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 18 Jan 2021 10:46:19 +0100 Subject: [PATCH 4/4] [35949] Allow to override priority in incoming mail (#8930) https://community.openproject.com/wp/35949 --- app/models/mail_handler.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb index c2ca738061..7b5d88e0be 100644 --- a/app/models/mail_handler.rb +++ b/app/models/mail_handler.rb @@ -123,6 +123,8 @@ class MailHandler < ActionMailer::Base options[:allow_override] << :project unless options[:issue].has_key?(:project) # Status overridable by default options[:allow_override] << :status unless options[:issue].has_key?(:status) + # Priority overridable by default + options[:allow_override] << :priority unless options[:issue].has_key?(:priority) options[:no_permission_check] = options[:no_permission_check].to_s == '1' end