Merge branch 'release/11.1' into dev

pull/8939/head
ulferts 4 years ago
commit cbca583949
No known key found for this signature in database
GPG Key ID: A205708DE1284017
  1. 1
      app/controllers/users_controller.rb
  2. 2
      app/models/mail_handler.rb
  3. 4
      app/views/work_packages/reports/_report_category.html.erb

@ -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)

@ -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

@ -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') %></span>
</div>
<%= render partial: 'report', locals: { report: report } %>
<br />
</div>
<%= render partial: 'report', locals: { report: report } %>

Loading…
Cancel
Save