Add latest changes from gitlab-org/gitlab@master

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])