Merge branch 'rails' into production.panel.sutty.nl

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 .apk-add: &apk-add
-- "apk add go-task diffutils"
+- "apk add go-task diffutils gitlab_ci_log_section"
 .disable-hainish: &disable-hainish
 - "rm -f .env.development"
 .cache-ruby: &cache-ruby
@@ -30,13 +30,18 @@ assets:
   - *cache-node
   - *cache-task
   before_script:
+  - "gitlab_ci_log_section --name git --header=\"Configuring git\""
   - "git config --global user.email \"${GIT_USER_EMAIL:-$GITLAB_USER_EMAIL}\""
   - "git config --global user.name \"${GIT_USER_NAME:-$GITLAB_USER_NAME}\""
   - "git remote set-url --push origin \"https://${GITLAB_USERNAME}:${GITLAB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git\""
+  - "gitlab_ci_log_section --name git --end"
+  - "gitlab_ci_log_section --name apk --header=\"Installing dependencies\""
   - "apk add brotli"
   - *apk-add
   - *disable-hainish
+  - "gitlab_ci_log_section --name apk --end"
   script:
+  - "gitlab_ci_log_section --name assets --header=\"Building\""
   - "go-task assets"
   after_script:
   - "git add public && git commit -m \"ci: assets [skip ci]\""

app/controllers/active_storage/direct_uploads_controller_decorator.rb

@@ -18,7 +18,8 @@ module ActiveStorage
       # para que puedan propagarse correctamente a través de todo el
       # stack.
       def blob_args
-        params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type, metadata: {}).to_h.symbolize_keys.tap do |ba|
+        params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type,
+                                     metadata: {}).to_h.symbolize_keys.tap do |ba|
           ba[:filename] = ba[:filename].unicode_normalize.sub(/\A_+/, '')
         end
       end

app/models/site/repository.rb

@@ -260,5 +260,10 @@ class Site
 
       r&.success?
     end
+
+    def lfs_cleanup
+      git_sh("git", "lfs", "prune")
+      git_sh("git", "lfs", "dedup")
+    end
   end
 end

app/services/cleanup_service.rb

@@ -31,7 +31,7 @@ class CleanupService
       site.deploys.find_each(&:cleanup!)
 
       site.repository.gc
-      lfs_cleanup
+      site.repository.lfs_cleanup
       site.touch
     end
   end
@@ -46,14 +46,8 @@ class CleanupService
       Rails.logger.info "Limpiando repositorio git de #{site.name}"
 
       site.repository.gc
-      lfs_cleanup
+      site.repository.lfs_cleanup
       site.touch
     end
   end
-
-  private 
-  def lfs_cleanup
-    site.repository.git_sh("git", "lfs", "prune")
-    site.repository.git_sh("git", "lfs", "dedup")
-  end
 end