diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 18:08:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 18:08:47 +0000 |
| commit | 3832718d895bf8268f3e3aac85948e2792769345 (patch) | |
| tree | 4a322399af568b6203e732ae2e2f3efc39b23a67 /app/controllers | |
| parent | 180cd023a11c0eb413ad0de124d9758ea25672bd (diff) | |
| download | gitlab-ce-3832718d895bf8268f3e3aac85948e2792769345.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
3 files changed, 9 insertions, 6 deletions
diff --git a/app/controllers/admin/applications_controller.rb b/app/controllers/admin/applications_controller.rb index 907b295870d..c017ecee054 100644 --- a/app/controllers/admin/applications_controller.rb +++ b/app/controllers/admin/applications_controller.rb @@ -55,6 +55,8 @@ class Admin::ApplicationsController < Admin::ApplicationController # Only allow a trusted parameter "white list" through. def application_params - params.require(:doorkeeper_application).permit(:name, :redirect_uri, :trusted, :scopes) + params + .require(:doorkeeper_application) + .permit(:name, :redirect_uri, :trusted, :scopes, :confidential) end end diff --git a/app/controllers/groups/registry/repositories_controller.rb b/app/controllers/groups/registry/repositories_controller.rb index cfddd8a3ba9..a4ef33ecc6a 100644 --- a/app/controllers/groups/registry/repositories_controller.rb +++ b/app/controllers/groups/registry/repositories_controller.rb @@ -7,13 +7,13 @@ module Groups before_action :feature_flag_group_container_registry_browser! def index - track_event(:list_repositories) - respond_to do |format| format.html format.json do @images = group.container_repositories.with_api_entity_associations + track_event(:list_repositories) + render json: ContainerRepositoriesSerializer .new(current_user: current_user) .represent_read_only(@images) diff --git a/app/controllers/projects/registry/repositories_controller.rb b/app/controllers/projects/registry/repositories_controller.rb index 9405fd526ae..5e933b3b51f 100644 --- a/app/controllers/projects/registry/repositories_controller.rb +++ b/app/controllers/projects/registry/repositories_controller.rb @@ -7,12 +7,13 @@ module Projects before_action :ensure_root_container_repository!, only: [:index] def index - @images = project.container_repositories - track_event(:list_repositories) - respond_to do |format| format.html format.json do + @images = project.container_repositories + + track_event(:list_repositories) + render json: ContainerRepositoriesSerializer .new(project: project, current_user: current_user) .represent(@images) |