diff options
Diffstat (limited to 'app/controllers/projects/settings')
4 files changed, 15 insertions, 5 deletions
diff --git a/app/controllers/projects/settings/access_tokens_controller.rb b/app/controllers/projects/settings/access_tokens_controller.rb index e3bb8c616df..1ecede4c7a2 100644 --- a/app/controllers/projects/settings/access_tokens_controller.rb +++ b/app/controllers/projects/settings/access_tokens_controller.rb @@ -50,13 +50,17 @@ module Projects end def create_params - params.require(:project_access_token).permit(:name, :expires_at, scopes: []) + params.require(:project_access_token).permit(:name, :expires_at, :access_level, scopes: []) end def set_index_vars + # Loading project members so that we can fetch access level of the bot + # user in the project without multiple queries. + @project.project_members.load + @scopes = Gitlab::Auth.resource_bot_scopes - @active_project_access_tokens = finder(state: 'active').execute - @inactive_project_access_tokens = finder(state: 'inactive', sort: 'expires_at_asc').execute + @active_project_access_tokens = finder(state: 'active').execute.preload_users + @inactive_project_access_tokens = finder(state: 'inactive', sort: 'expires_at_asc').execute.preload_users @new_project_access_token = PersonalAccessToken.redis_getdel(key_identity) end diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index 3254d4129d3..960c0beb244 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -12,6 +12,7 @@ module Projects before_action :define_variables before_action do push_frontend_feature_flag(:ajax_new_deploy_token, @project) + push_frontend_feature_flag(:ci_scoped_job_token, @project, default_enabled: :yaml) end helper_method :highlight_badge diff --git a/app/controllers/projects/settings/integrations_controller.rb b/app/controllers/projects/settings/integrations_controller.rb index e54f4c511db..c9d92d1aee9 100644 --- a/app/controllers/projects/settings/integrations_controller.rb +++ b/app/controllers/projects/settings/integrations_controller.rb @@ -9,7 +9,7 @@ module Projects feature_category :integrations def show - @integrations = @project.find_or_initialize_services + @integrations = @project.find_or_initialize_integrations end end end diff --git a/app/controllers/projects/settings/packages_and_registries_controller.rb b/app/controllers/projects/settings/packages_and_registries_controller.rb index fee51dc1311..8f0a19cfac5 100644 --- a/app/controllers/projects/settings/packages_and_registries_controller.rb +++ b/app/controllers/projects/settings/packages_and_registries_controller.rb @@ -16,7 +16,12 @@ module Projects private def packages_and_registries_settings_enabled! - render_404 unless settings_packages_and_registries_enabled?(project) + render_404 unless can_destroy_container_registry_image?(project) + end + + def can_destroy_container_registry_image?(project) + Gitlab.config.registry.enabled && + can?(current_user, :destroy_container_image, project) end end end |