diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 09:09:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 09:09:46 +0000 |
commit | 221b529789f4090341a825695aeb49b8df6dd11d (patch) | |
tree | c8843e4ca5ef1034752eb68712fcf338b24950db /app/controllers | |
parent | 00a8c64ffd18e74df4b1cdeda7776b5221fddafe (diff) | |
download | gitlab-ce-221b529789f4090341a825695aeb49b8df6dd11d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/groups/registry/repositories_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/projects/static_site_editor_controller.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/groups/registry/repositories_controller.rb b/app/controllers/groups/registry/repositories_controller.rb index 0240c87e699..16aa6e50320 100644 --- a/app/controllers/groups/registry/repositories_controller.rb +++ b/app/controllers/groups/registry/repositories_controller.rb @@ -9,7 +9,7 @@ module Groups respond_to do |format| format.html format.json do - @images = group.container_repositories.with_api_entity_associations + @images = ContainerRepositoriesFinder.new(user: current_user, subject: group).execute.with_api_entity_associations track_event(:list_repositories) diff --git a/app/controllers/projects/static_site_editor_controller.rb b/app/controllers/projects/static_site_editor_controller.rb index 98ec2335899..74f28c3da67 100644 --- a/app/controllers/projects/static_site_editor_controller.rb +++ b/app/controllers/projects/static_site_editor_controller.rb @@ -2,10 +2,13 @@ class Projects::StaticSiteEditorController < Projects::ApplicationController include ExtractsPath + include CreatesCommit + layout 'fullscreen' prepend_before_action :authenticate_user!, only: [:show] before_action :assign_ref_and_path, only: [:show] + before_action :authorize_edit_tree!, only: [:show] def show @config = Gitlab::StaticSiteEditor::Config.new(@repository, @ref, @path, params[:return_url]) |