diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/controllers/groups | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/controllers/groups')
-rw-r--r-- | app/controllers/groups/boards_controller.rb | 7 | ||||
-rw-r--r-- | app/controllers/groups/dependency_proxy_for_containers_controller.rb | 13 |
2 files changed, 16 insertions, 4 deletions
diff --git a/app/controllers/groups/boards_controller.rb b/app/controllers/groups/boards_controller.rb index fa109021b7d..3354c0a5c9f 100644 --- a/app/controllers/groups/boards_controller.rb +++ b/app/controllers/groups/boards_controller.rb @@ -9,6 +9,7 @@ class Groups::BoardsController < Groups::ApplicationController before_action :assign_endpoint_vars before_action do push_frontend_feature_flag(:graphql_board_lists, group, default_enabled: false) + push_frontend_feature_flag(:boards_filtered_search, group) end feature_category :boards @@ -21,13 +22,13 @@ class Groups::BoardsController < Groups::ApplicationController def boards_finder strong_memoize :boards_finder do - Boards::ListService.new(parent, current_user) + Boards::BoardsFinder.new(parent, current_user) end end def board_finder strong_memoize :board_finder do - Boards::ListService.new(parent, current_user, board_id: params[:id]) + Boards::BoardsFinder.new(parent, current_user, board_id: params[:id]) end end @@ -44,6 +45,6 @@ class Groups::BoardsController < Groups::ApplicationController end def authorize_read_board! - access_denied! unless can?(current_user, :read_board, group) + access_denied! unless can?(current_user, :read_issue_board, group) end end diff --git a/app/controllers/groups/dependency_proxy_for_containers_controller.rb b/app/controllers/groups/dependency_proxy_for_containers_controller.rb index 0f640397320..e2c104f88a4 100644 --- a/app/controllers/groups/dependency_proxy_for_containers_controller.rb +++ b/app/controllers/groups/dependency_proxy_for_containers_controller.rb @@ -16,7 +16,18 @@ class Groups::DependencyProxyForContainersController < Groups::ApplicationContro result = DependencyProxy::FindOrCreateManifestService.new(group, image, tag, token).execute if result[:status] == :success - send_upload(result[:manifest].file) + response.headers['Docker-Content-Digest'] = result[:manifest].digest + response.headers['Content-Length'] = result[:manifest].size + response.headers['Docker-Distribution-Api-Version'] = DependencyProxy::DISTRIBUTION_API_VERSION + response.headers['Etag'] = "\"#{result[:manifest].digest}\"" + content_type = result[:manifest].content_type + + send_upload( + result[:manifest].file, + proxy: true, + redirect_params: { query: { 'response-content-type' => content_type } }, + send_params: { type: content_type } + ) else render status: result[:http_status], json: result[:message] end |