Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 2 insertions, 22 deletions

diff --git a/app/controllers/projects/static_site_editor_controller.rb b/app/controllers/projects/static_site_editor_controller.rb
index 0d9a6f568a1..fed6307514e 100644
--- a/app/controllers/projects/static_site_editor_controller.rb
+++ b/app/controllers/projects/static_site_editor_controller.rb
@@ -3,6 +3,7 @@
 class Projects::StaticSiteEditorController < Projects::ApplicationController
   include ExtractsPath
   include CreatesCommit
+  include BlobHelper
 
   layout 'fullscreen'
 
@@ -24,28 +25,7 @@ class Projects::StaticSiteEditorController < Projects::ApplicationController
   end
 
   def show
-    service_response = ::StaticSiteEditor::ConfigService.new(
-      container: project,
-      current_user: current_user,
-      params: {
-        ref: @ref,
-        path: @path,
-        return_url: params[:return_url]
-      }
-    ).execute
-
-    if service_response.success?
-      Gitlab::UsageDataCounters::StaticSiteEditorCounter.increment_views_count
-
-      @data = serialize_necessary_payload_values_to_json(service_response.payload)
-    else
-      # TODO: For now, if the service returns any error, the user is redirected
-      #       to the root project page with the error message displayed as an alert.
-      #       See https://gitlab.com/gitlab-org/gitlab/-/issues/213285#note_414808004
-      #       for discussion of plans to handle this via a page owned by the Static Site Editor.
-      flash[:alert] = service_response.message
-      redirect_to project_path(project)
-    end
+    redirect_to ide_edit_path(project, @ref, @path)
   end
 
   private