diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-04 13:41:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-04 13:41:07 +0000 |
commit | 4f791ec8bd51d2bacada5ba48334c16076cf91b8 (patch) | |
tree | 89c61fbbfdc63b8d920787f78ff226967b87d7b8 /app | |
parent | 056dd422ea9e03869c182a9200fcbe9166d01ad1 (diff) | |
download | gitlab-ce-4f791ec8bd51d2bacada5ba48334c16076cf91b8.tar.gz |
Add latest changes from gitlab-org/gitlab@14-10-stable-ee
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/workhorse_helper.rb | 2 | ||||
-rw-r--r-- | app/policies/project_policy.rb | 2 | ||||
-rw-r--r-- | app/views/notify/issue_due_email.html.haml | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/app/helpers/workhorse_helper.rb b/app/helpers/workhorse_helper.rb index f1ddc2e902e..70df696510a 100644 --- a/app/helpers/workhorse_helper.rb +++ b/app/helpers/workhorse_helper.rb @@ -38,8 +38,6 @@ module WorkhorseHelper # Send an entry from artifacts through Workhorse and set safe content type def send_artifacts_entry(file, entry) headers.store(*Gitlab::Workhorse.send_artifacts_entry(file, entry)) - headers.store(*Gitlab::Workhorse.detect_content_type) - head :ok end diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index a417ea35673..68b288bdc87 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -664,7 +664,7 @@ class ProjectPolicy < BasePolicy enable :read_security_configuration end - rule { can?(:guest_access) & can?(:read_commit_status) }.policy do + rule { can?(:guest_access) & can?(:download_code) }.policy do enable :create_merge_request_in end diff --git a/app/views/notify/issue_due_email.html.haml b/app/views/notify/issue_due_email.html.haml index 3208d061928..9dd501022dd 100644 --- a/app/views/notify/issue_due_email.html.haml +++ b/app/views/notify/issue_due_email.html.haml @@ -1,5 +1,5 @@ %p.details - = sprintf(s_("Notify|%{author_link}'s issue %{issue_reference_link} is due soon."), { author_link: link_to(@issue.author_name, user_url(@issue.author)), issue_reference_link: issue_reference_link(@issue) }) + = sprintf(s_("Notify|%{author_link}'s issue %{issue_reference_link} is due soon."), { author_link: link_to(@issue.author_name, user_url(@issue.author)), issue_reference_link: issue_reference_link(@issue) }).html_safe - if @issue.assignees.any? %p |