Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
9a4a13601d
commit
181c5927ae
|
@ -1,5 +1,5 @@
|
|||
- type = local_assigns.fetch(:type)
|
||||
- bulk_issue_health_status_flag = Feature.enabled?(:bulk_update_health_status, @project&.group, default_enabled: true) && type == :issues && @project&.group&.feature_available?(:issuable_health_status)
|
||||
- bulk_issue_health_status_flag = type == :issues && @project&.group&.feature_available?(:issuable_health_status)
|
||||
- epic_bulk_edit_flag = @project&.group&.feature_available?(:epics) && type == :issues
|
||||
|
||||
%aside.issues-bulk-update.js-right-sidebar.right-sidebar{ "aria-live" => "polite", data: { 'signed-in': current_user.present? } }
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix the header name for basic auth authentication in package managers APIs
|
||||
merge_request: 49836
|
||||
author:
|
||||
type: fixed
|
|
@ -1,8 +0,0 @@
|
|||
---
|
||||
name: bulk_update_health_status
|
||||
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33065
|
||||
rollout_issue_url:
|
||||
milestone: '13.2'
|
||||
type: development
|
||||
group: group::product planning
|
||||
default_enabled: true
|
|
@ -7,8 +7,8 @@ module API
|
|||
extend ::Gitlab::Utils::Override
|
||||
|
||||
module Constants
|
||||
AUTHENTICATE_REALM_HEADER = 'Www-Authenticate: Basic realm'
|
||||
AUTHENTICATE_REALM_NAME = 'GitLab Packages Registry'
|
||||
AUTHENTICATE_REALM_HEADER = 'WWW-Authenticate'
|
||||
AUTHENTICATE_REALM_NAME = 'Basic realm="GitLab Packages Registry"'
|
||||
end
|
||||
|
||||
include Constants
|
||||
|
|
|
@ -12,7 +12,7 @@ RSpec.shared_examples 'rejects nuget packages access' do |user_type, status, add
|
|||
it 'has the correct response header' do
|
||||
subject
|
||||
|
||||
expect(response.headers['Www-Authenticate: Basic realm']).to eq 'GitLab Packages Registry'
|
||||
expect(response.headers['WWW-Authenticate']).to eq 'Basic realm="GitLab Packages Registry"'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue