From 097db453e419125f59dc30b53a1749a56a2921c8 Mon Sep 17 00:00:00 2001
From: Sutty <sutty@sutty.nl>
Date: Thu, 19 Oct 2023 15:08:10 +0000
Subject: [PATCH 01/14] fix: schema dump

---
 db/structure.sql | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/db/structure.sql b/db/structure.sql
index e0d8f710..20c552a1 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -16,6 +16,20 @@ SET row_security = off;
 -- *not* creating schema, since initdb creates it
 
 
+--
+-- Name: dblink; Type: EXTENSION; Schema: -; Owner: -
+--
+
+CREATE EXTENSION IF NOT EXISTS dblink WITH SCHEMA public;
+
+
+--
+-- Name: EXTENSION dblink; Type: COMMENT; Schema: -; Owner: -
+--
+
+COMMENT ON EXTENSION dblink IS 'connect to other PostgreSQL databases from within a database';
+
+
 --
 -- Name: pg_trgm; Type: EXTENSION; Schema: -; Owner: -
 --
@@ -1149,7 +1163,8 @@ CREATE TABLE public.roles (
     site_id integer,
     usuarie_id integer,
     rol character varying,
-    temporal boolean
+    temporal boolean,
+    token character varying
 );
 
 
@@ -1236,7 +1251,9 @@ CREATE TABLE public.sites (
     tienda_url character varying DEFAULT ''::character varying,
     api_key_ciphertext character varying,
     slugify_mode character varying DEFAULT 'default'::character varying,
-    pagination boolean DEFAULT false
+    pagination boolean DEFAULT false,
+    private_key_pem_ciphertext text,
+    last_indexed_commit character varying
 );
 
 
@@ -2234,6 +2251,13 @@ ALTER TABLE ONLY public.active_storage_attachments
     ADD CONSTRAINT fk_rails_c3b3935057 FOREIGN KEY (blob_id) REFERENCES public.active_storage_blobs(id);
 
 
+--
+-- Name: publisher; Type: PUBLICATION; Schema: -; Owner: -
+--
+
+CREATE PUBLICATION publisher FOR ALL TABLES WITH (publish = 'insert, update, delete, truncate');
+
+
 --
 -- PostgreSQL database dump complete
 --
@@ -2318,6 +2342,10 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20230421182627'),
 ('20230424174544'),
 ('20230519143500'),
-('20230524190240');
+('20230524190240'),
+('20230731195050'),
+('20230829204127'),
+('20230921155401'),
+('20230927153926');
 
 

From 9ec0dc87a9426a3a101416e5044b40d8e274f08e Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 31 Oct 2023 13:53:45 -0300
Subject: [PATCH 02/14] fix: hacer un merge cuando hay cambios #14533

---
 app/jobs/git_pull_job.rb      | 6 +++++-
 app/models/site/repository.rb | 9 +++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/jobs/git_pull_job.rb b/app/jobs/git_pull_job.rb
index dc4a285c..c7063650 100644
--- a/app/jobs/git_pull_job.rb
+++ b/app/jobs/git_pull_job.rb
@@ -8,6 +8,10 @@ class GitPullJob < ApplicationJob
     # @param :message [String]
     # @return [nil]
     def perform(site, usuarie, message)
-      site.repository.merge(usuarie, message) if site.repository.fetch&.positive?
+      site.repository.fetch
+
+      return if site.repository.up_to_date?
+
+      site.repository.merge(usuarie, message)
     end
 end
\ No newline at end of file
diff --git a/app/models/site/repository.rb b/app/models/site/repository.rb
index acbf6553..17ee0792 100644
--- a/app/models/site/repository.rb
+++ b/app/models/site/repository.rb
@@ -111,10 +111,11 @@ class Site
       walker.each.to_a
     end
 
-    # Hay commits sin aplicar?
-    def needs_pull?
-      fetch
-      !commits.empty?
+    # Detecta si hay que hacer un pull o no
+    #
+    # @return [Boolean]
+    def up_to_date?
+      rugged.merge_analysis(remote_head_commit).include?(:up_to_date)
     end
 
     # Guarda los cambios en git

From f00d6c6d45425dd2c98c7df5ce1cc2444bd8b20a Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 31 Oct 2023 13:54:19 -0300
Subject: [PATCH 03/14] feat: hacer fast forward si no hay cambios locales
 #14533

---
 app/jobs/git_pull_job.rb      | 27 +++++++++++++++++----------
 app/models/site/repository.rb | 32 ++++++++++++++++++++++++++++----
 2 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/app/jobs/git_pull_job.rb b/app/jobs/git_pull_job.rb
index c7063650..77f75ba9 100644
--- a/app/jobs/git_pull_job.rb
+++ b/app/jobs/git_pull_job.rb
@@ -1,17 +1,24 @@
 # frozen_string_literal: true
 
-# Permite traer los cambios desde webhooks
-
+# Permite traer los cambios desde el repositorio remoto
 class GitPullJob < ApplicationJob
-    # @param :site [Site]
-    # @param :usuarie [Usuarie]
-    # @param :message [String]
-    # @return [nil]
-    def perform(site, usuarie, message)
-      site.repository.fetch
+  # @param :site [Site]
+  # @param :usuarie [Usuarie]
+  # @param :message [String]
+  # @return [nil]
+  def perform(site, usuarie, message)
+    site.repository.fetch
 
-      return if site.repository.up_to_date?
+    return if site.repository.up_to_date?
 
+    if site.repository.fast_forward?
+      site.repository.fast_forward!
+    else
       site.repository.merge(usuarie, message)
     end
-end
\ No newline at end of file
+
+    git_lfs_checkout
+
+    nil
+  end
+end
diff --git a/app/models/site/repository.rb b/app/models/site/repository.rb
index 17ee0792..e77aded9 100644
--- a/app/models/site/repository.rb
+++ b/app/models/site/repository.rb
@@ -75,13 +75,18 @@ class Site
       # Forzamos el checkout para mover el HEAD al último commit y
       # escribir los cambios
       rugged.checkout 'HEAD', strategy: :force
-      
-      git_sh("git", "lfs", "fetch", "origin", default_branch)
-      # reemplaza los pointers por los archivos correspondientes            
-      git_sh("git", "lfs", "checkout")
+
       commit
     end
 
+    # Trae todos los archivos desde LFS
+    #
+    # @return [Boolean]
+    def git_lfs_checkout
+      git_sh('git', 'lfs', 'fetch', 'origin', default_branch)
+      git_sh('git', 'lfs', 'checkout')
+    end
+
     # El último commit
     #
     # @return [Rugged::Commit]
@@ -118,6 +123,25 @@ class Site
       rugged.merge_analysis(remote_head_commit).include?(:up_to_date)
     end
 
+    # Detecta si es posible adelantar la historia local a la remota o
+    # necesitamos un merge
+    #
+    # @return [Boolean]
+    def fast_forward?
+      rugged.merge_analysis(remote_head_commit).include?(:fastforward)
+    end
+
+    # Mueve la historia local a la remota
+    #
+    # @see {https://stackoverflow.com/a/27077322}
+    # @return [nil]
+    def fast_forward!
+      rugged.checkout_tree(remote_head_commit)
+      rugged.references.update(rugged.head.resolve, remote_head_commit.oid)
+
+      nil
+    end
+
     # Guarda los cambios en git
     #
     # @param :add [Array] Archivos a agregar

From 6ef83624a174ebf0bdc3548b7116932b34da9e69 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 31 Oct 2023 13:59:11 -0300
Subject: [PATCH 04/14] =?UTF-8?q?fix:=20era=20un=20m=C3=A9todo=20del=20sit?=
 =?UTF-8?q?io?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/jobs/git_pull_job.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/jobs/git_pull_job.rb b/app/jobs/git_pull_job.rb
index 77f75ba9..49784f50 100644
--- a/app/jobs/git_pull_job.rb
+++ b/app/jobs/git_pull_job.rb
@@ -17,7 +17,7 @@ class GitPullJob < ApplicationJob
       site.repository.merge(usuarie, message)
     end
 
-    git_lfs_checkout
+    site.git_lfs_checkout
 
     nil
   end

From 3193d72486bb37b95250c7180bf5ebfacd2f4ddf Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 31 Oct 2023 13:59:59 -0300
Subject: [PATCH 05/14] fix: era un metodo del repositorio!

---
 app/jobs/git_pull_job.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/jobs/git_pull_job.rb b/app/jobs/git_pull_job.rb
index 49784f50..271ad91a 100644
--- a/app/jobs/git_pull_job.rb
+++ b/app/jobs/git_pull_job.rb
@@ -17,7 +17,7 @@ class GitPullJob < ApplicationJob
       site.repository.merge(usuarie, message)
     end
 
-    site.git_lfs_checkout
+    site.repository.git_lfs_checkout
 
     nil
   end

From b67193fbca8533ee0b798f63ac1b2721484ae790 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 1 Nov 2023 17:02:32 -0300
Subject: [PATCH 06/14] feat: soportar varias instancias de distributed press
 #14540

---
 app/models/deploy_distributed_press.rb             | 10 ++++++----
 ...6_add_default_to_distributed_press_publisher.rb | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20231101200026_add_default_to_distributed_press_publisher.rb

diff --git a/app/models/deploy_distributed_press.rb b/app/models/deploy_distributed_press.rb
index 2c892b55..69c162aa 100644
--- a/app/models/deploy_distributed_press.rb
+++ b/app/models/deploy_distributed_press.rb
@@ -101,12 +101,14 @@ class DeployDistributedPress < Deploy
 
   # El cliente de la API
   #
-  # TODO: cuando soportemos más, tiene que haber una relación entre
-  # DeployDistributedPress y DistributedPressPublisher.
-  #
   # @return [DistributedPressPublisher]
   def publisher
-    @publisher ||= DistributedPressPublisher.last
+    @publisher ||=
+      if distributed_press_publisher_id
+        DistributedPressPublisher.find(distributed_press_publisher_id)
+      else
+        DistributedPressPublisher.find_by_default(true)
+      end
   end
 
   # El cliente para actualizar el sitio
diff --git a/db/migrate/20231101200026_add_default_to_distributed_press_publisher.rb b/db/migrate/20231101200026_add_default_to_distributed_press_publisher.rb
new file mode 100644
index 00000000..ada9392f
--- /dev/null
+++ b/db/migrate/20231101200026_add_default_to_distributed_press_publisher.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Una instancia es la instancia por defecto
+class AddDefaultToDistributedPressPublisher < ActiveRecord::Migration[6.1]
+  def up
+    add_column :distributed_press_publishers, :default, :boolean, default: false
+
+    DistributedPressPublisher.last.update(default: true)
+  end
+
+  def down
+    remove_column :distributed_press_publishers, :default
+  end
+end

From 5540232b7e46aa3ecaa3114d3d2d05079caf4abf Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 1 Nov 2023 17:09:32 -0300
Subject: [PATCH 07/14] fix: la instancia puede repetirse

---
 app/models/distributed_press_publisher.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/distributed_press_publisher.rb b/app/models/distributed_press_publisher.rb
index 6139db93..4c3293e3 100644
--- a/app/models/distributed_press_publisher.rb
+++ b/app/models/distributed_press_publisher.rb
@@ -13,8 +13,8 @@ class DistributedPressPublisher < ApplicationRecord
   # @return [IO]
   attr_reader :logger_out
 
-  # La instancia es única
-  validates_uniqueness_of :instance
+  # La instancia es necesaria pero no única
+  validates_presence_of :instance
 
   # El token es necesario
   validates_presence_of :token

From f5af85a66eaf822c1f6d3b4e987b9e3a909a4d60 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 1 Nov 2023 17:11:31 -0300
Subject: [PATCH 08/14] fix: guardar el id como JSON

---
 app/models/deploy_distributed_press.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/deploy_distributed_press.rb b/app/models/deploy_distributed_press.rb
index 69c162aa..58fea294 100644
--- a/app/models/deploy_distributed_press.rb
+++ b/app/models/deploy_distributed_press.rb
@@ -13,7 +13,7 @@ require 'njalla/v1'
 # Al ser publicado, envía los archivos en un tarball y actualiza la
 # información.
 class DeployDistributedPress < Deploy
-  store :values, accessors: %i[hostname remote_site_id remote_info], coder: JSON
+  store :values, accessors: %i[hostname remote_site_id remote_info distributed_press_publisher_id], coder: JSON
 
   before_create :create_remote_site!, :create_njalla_records!
   before_destroy :delete_remote_site!, :delete_njalla_records!

From 9709f419ca6756d21ba21bb41cad6fce0cb0bb08 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 17 Nov 2023 18:19:13 -0300
Subject: [PATCH 09/14] =?UTF-8?q?fix:=20notificar=20cuando=20falla=20la=20?=
 =?UTF-8?q?=C3=BAltima=20compilaci=C3=B3n=20#14555?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/jobs/deploy_job.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/jobs/deploy_job.rb b/app/jobs/deploy_job.rb
index 291991c7..adba1815 100644
--- a/app/jobs/deploy_job.rb
+++ b/app/jobs/deploy_job.rb
@@ -56,6 +56,10 @@ class DeployJob < ApplicationJob
           rescue URI::Error
             nil
           end.compact
+
+          unless d == @site.deployment_list.last && !status
+            raise DeployException, 'Falló la compilación'
+          end
         rescue StandardError => e
           status = false
           seconds ||= 0

From c8e1d502324f427382e74dc97b7b227fccb7c493 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 17 Nov 2023 18:40:34 -0300
Subject: [PATCH 10/14] fix: reversed logic

---
 app/jobs/deploy_job.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/jobs/deploy_job.rb b/app/jobs/deploy_job.rb
index adba1815..3044b59f 100644
--- a/app/jobs/deploy_job.rb
+++ b/app/jobs/deploy_job.rb
@@ -57,7 +57,7 @@ class DeployJob < ApplicationJob
             nil
           end.compact
 
-          unless d == @site.deployment_list.last && !status
+          if d == @site.deployment_list.last && !status
             raise DeployException, 'Falló la compilación'
           end
         rescue StandardError => e

From aaf2ca8757e32cc4d0cd567105ecfd46abf18388 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 23 Nov 2023 18:41:49 -0300
Subject: [PATCH 11/14] fix: deshabilitar njalla #14696

---
 Gemfile                                |  1 -
 Gemfile.lock                           |  4 --
 app/models/deploy_distributed_press.rb | 60 +-------------------------
 3 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/Gemfile b/Gemfile
index 972560b4..bf9e875c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,7 +40,6 @@ gem 'devise'
 gem 'devise-i18n'
 gem 'devise_invitable'
 gem 'distributed-press-api-client', '~> 0.3.0rc0'
-gem 'njalla-api-client', '~> 0.2.0'
 gem 'email_address', git: 'https://github.com/fauno/email_address', branch: 'i18n'
 gem 'exception_notification'
 gem 'fast_blank'
diff --git a/Gemfile.lock b/Gemfile.lock
index 39394a8c..3faad5e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -366,9 +366,6 @@ GEM
     net-ssh (7.1.0)
     netaddr (2.0.6)
     nio4r (2.5.9-x86_64-linux-musl)
-    njalla-api-client (0.2.0)
-      dry-schema
-      httparty (~> 0.18)
     nokogiri (1.15.4-x86_64-linux-musl)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -636,7 +633,6 @@ DEPENDENCIES
   mini_magick
   mobility
   net-ssh
-  njalla-api-client (~> 0.2.0)
   nokogiri
   pg
   pg_search
diff --git a/app/models/deploy_distributed_press.rb b/app/models/deploy_distributed_press.rb
index 2c892b55..da8fe209 100644
--- a/app/models/deploy_distributed_press.rb
+++ b/app/models/deploy_distributed_press.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'distributed_press/v1/client/site'
-require 'njalla/v1'
 
 # Soportar Distributed Press APIv1
 #
@@ -15,8 +14,8 @@ require 'njalla/v1'
 class DeployDistributedPress < Deploy
   store :values, accessors: %i[hostname remote_site_id remote_info], coder: JSON
 
-  before_create :create_remote_site!, :create_njalla_records!
-  before_destroy :delete_remote_site!, :delete_njalla_records!
+  before_create :create_remote_site!
+  before_destroy :delete_remote_site!
 
   DEPENDENCIES = %i[deploy_local]
 
@@ -31,17 +30,12 @@ class DeployDistributedPress < Deploy
     time_start
 
     create_remote_site! if remote_site_id.blank?
-    create_njalla_records!
     save
 
     if remote_site_id.blank?
       raise DeployJob::DeployException, 'El sitio no se creó en Distributed Press'
     end
 
-    if create_njalla_records? && remote_info[:njalla].blank?
-      raise DeployJob::DeployException, 'No se pudieron crear los registros necesarios en Njalla'
-    end
-
     site_client.tap do |c|
       stdout = Thread.new(publisher.logger_out) do |io|
         until io.eof?
@@ -145,29 +139,6 @@ class DeployDistributedPress < Deploy
     nil
   end
 
-  # Crea los registros en Njalla
-  #
-  # XXX: Esto depende de nuestro DNS actual, cuando lo migremos hay
-  # que eliminarlo.
-  #
-  # @return [nil]
-  def create_njalla_records!
-    return unless create_njalla_records?
-
-    self.remote_info ||= {}
-    self.remote_info[:njalla] ||= {}
-    self.remote_info[:njalla][:a]     ||= njalla.add_record(name: site.name, type: 'CNAME', content: "#{Site.domain}.").to_h
-    self.remote_info[:njalla][:cname] ||= njalla.add_record(name: "www.#{site.name}", type: 'CNAME', content: "#{Site.domain}.").to_h
-    self.remote_info[:njalla][:ns]    ||= njalla.add_record(name: "_dnslink.#{site.name}", type: 'NS', content: "#{publisher.hostname}.").to_h
-
-    nil
-  rescue HTTParty::Error => e
-    ExceptionNotifier.notify_exception(e, data: { site: site.name })
-    self.remote_info.delete :njalla
-  ensure
-    nil
-  end
-
   # Registra lo que sucedió
   #
   # @param status [Bool]
@@ -185,31 +156,4 @@ class DeployDistributedPress < Deploy
     ExceptionNotifier.notify_exception(e, data: { site: site.name })
     nil
   end
-
-  def delete_njalla_records!
-    return unless create_njalla_records?
-
-    %w[a ns cname].each do |type|
-      next if (id = remote_info.dig('njalla', type, 'id')).blank?
-
-      njalla.remove_record(id: id.to_i)
-    end
-  end
-
-  # Actualizar registros en Njalla
-  #
-  # @return [Njalla::V1::Domain]
-  def njalla
-    @njalla ||=
-      begin
-        client = Njalla::V1::Client.new(token: Rails.application.credentials.njalla)
-
-        Njalla::V1::Domain.new(domain: Site.domain, client: client)
-      end
-  end
-
-  # Detecta si tenemos que crear registros en Njalla
-  def create_njalla_records?
-    !site.name.end_with?('.')
-  end
 end

From c5da02cf3edb20567674bcf697fcd524bc19f182 Mon Sep 17 00:00:00 2001
From: fauno <fauno@endefensadelsl.org>
Date: Thu, 30 Nov 2023 16:39:25 +0000
Subject: [PATCH 12/14] ci: assets [skip ci]

(cherry picked from commit 2a6a25a9cd4ee0e230c41f46f5114a278e232a45)
---
 .../.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json  | 2 +-
 public/packs/css/application-bb1478c7.css                      | 3 ---
 public/packs/css/application-bb1478c7.css.br                   | 3 ---
 public/packs/css/application-bb1478c7.css.gz                   | 3 ---
 public/packs/js/application-17c8ec1abff8d9ee68fc.js            | 3 ---
 .../packs/js/application-17c8ec1abff8d9ee68fc.js.LICENSE.txt   | 3 ---
 public/packs/js/application-17c8ec1abff8d9ee68fc.js.br         | 3 ---
 public/packs/js/application-17c8ec1abff8d9ee68fc.js.gz         | 3 ---
 public/packs/js/application-17c8ec1abff8d9ee68fc.js.map        | 3 ---
 public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.br     | 3 ---
 public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.gz     | 3 ---
 public/packs/manifest.json                                     | 3 ---
 public/packs/manifest.json.br                                  | 3 ---
 public/packs/manifest.json.gz                                  | 3 ---
 public/packs/media/fonts/forkawesome-webfont-2dfb5f36.woff     | 3 ---
 public/packs/media/fonts/forkawesome-webfont-7c20758e.woff2    | 3 ---
 public/packs/media/fonts/forkawesome-webfont-86541105.svg      | 3 ---
 public/packs/media/fonts/forkawesome-webfont-86541105.svg.br   | 3 ---
 public/packs/media/fonts/forkawesome-webfont-86541105.svg.gz   | 3 ---
 public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot      | 3 ---
 public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.br   | 3 ---
 public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.gz   | 3 ---
 public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf      | 3 ---
 public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.br   | 3 ---
 public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.gz   | 3 ---
 public/packs/media/images/layers-2x-8f2c4d11.png               | 3 ---
 public/packs/media/images/layers-416d9136.png                  | 3 ---
 public/packs/media/images/marker-icon-2b3e1faf.png             | 3 ---
 public/packs/media/images/marker-icon-2x-680f69f3.png          | 3 ---
 public/packs/media/images/marker-shadow-a0c6cc14.png           | 3 ---
 30 files changed, 1 insertion(+), 88 deletions(-)
 delete mode 100644 public/packs/css/application-bb1478c7.css
 delete mode 100644 public/packs/css/application-bb1478c7.css.br
 delete mode 100644 public/packs/css/application-bb1478c7.css.gz
 delete mode 100644 public/packs/js/application-17c8ec1abff8d9ee68fc.js
 delete mode 100644 public/packs/js/application-17c8ec1abff8d9ee68fc.js.LICENSE.txt
 delete mode 100644 public/packs/js/application-17c8ec1abff8d9ee68fc.js.br
 delete mode 100644 public/packs/js/application-17c8ec1abff8d9ee68fc.js.gz
 delete mode 100644 public/packs/js/application-17c8ec1abff8d9ee68fc.js.map
 delete mode 100644 public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.br
 delete mode 100644 public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.gz
 delete mode 100644 public/packs/manifest.json
 delete mode 100644 public/packs/manifest.json.br
 delete mode 100644 public/packs/manifest.json.gz
 delete mode 100644 public/packs/media/fonts/forkawesome-webfont-2dfb5f36.woff
 delete mode 100644 public/packs/media/fonts/forkawesome-webfont-7c20758e.woff2
 delete mode 100644 public/packs/media/fonts/forkawesome-webfont-86541105.svg
 delete mode 100644 public/packs/media/fonts/forkawesome-webfont-86541105.svg.br
 delete mode 100644 public/packs/media/fonts/forkawesome-webfont-86541105.svg.gz
 delete mode 100644 public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot
 delete mode 100644 public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.br
 delete mode 100644 public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.gz
 delete mode 100644 public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf
 delete mode 100644 public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.br
 delete mode 100644 public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.gz
 delete mode 100644 public/packs/media/images/layers-2x-8f2c4d11.png
 delete mode 100644 public/packs/media/images/layers-416d9136.png
 delete mode 100644 public/packs/media/images/marker-icon-2b3e1faf.png
 delete mode 100644 public/packs/media/images/marker-icon-2x-680f69f3.png
 delete mode 100644 public/packs/media/images/marker-shadow-a0c6cc14.png

diff --git a/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json b/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json
index 6d1b664d..9da8ba55 100644
--- a/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json
+++ b/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0bd21756fd55d772a0d310db827bd41b2d1fbdd6d6924ad212803ed33971725
+oid sha256:0be27a81c40641903cee5772ab6ff0064db2ce35438c58b264fa1c0accb9073c
 size 14525
diff --git a/public/packs/css/application-bb1478c7.css b/public/packs/css/application-bb1478c7.css
deleted file mode 100644
index 00ee9254..00000000
--- a/public/packs/css/application-bb1478c7.css
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fd3bb412b63723fe63fa107ffac78bd6396487ccd69e4ea6d098848739a075d
-size 49279
diff --git a/public/packs/css/application-bb1478c7.css.br b/public/packs/css/application-bb1478c7.css.br
deleted file mode 100644
index 0b1db25e..00000000
--- a/public/packs/css/application-bb1478c7.css.br
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:243e15e5a405fd51203d0fe34119c018691da4bfdd00be0cf26aa3e2abb5634d
-size 10005
diff --git a/public/packs/css/application-bb1478c7.css.gz b/public/packs/css/application-bb1478c7.css.gz
deleted file mode 100644
index 7cadc76e..00000000
--- a/public/packs/css/application-bb1478c7.css.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a3d0b479d7ebdc77c8ef3549085248c2b668a61fea1a1e3700bc918fe505c4ff
-size 12351
diff --git a/public/packs/js/application-17c8ec1abff8d9ee68fc.js b/public/packs/js/application-17c8ec1abff8d9ee68fc.js
deleted file mode 100644
index 37480493..00000000
--- a/public/packs/js/application-17c8ec1abff8d9ee68fc.js
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:11cb44a373f826146b847520f0dd20a7549d4fac1c5a90d1deac260b421e5c68
-size 1492424
diff --git a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.LICENSE.txt b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.LICENSE.txt
deleted file mode 100644
index 979d1ab9..00000000
--- a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.LICENSE.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c3b9ae1697c4b8a404afe77afe035de28b7f4880e9f52caac82620bb8d8ed495
-size 854
diff --git a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.br b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.br
deleted file mode 100644
index b357cdd6..00000000
--- a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.br
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:48ccffc31d33c10d77f4ae691a26b64c1398fe4ec86071ba01430a4bfbdc3c00
-size 326998
diff --git a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.gz b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.gz
deleted file mode 100644
index f3d19ecd..00000000
--- a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4634538d756c8168c99dc53f33a593a99efd7f4e183ca2d4203883136e72ba2
-size 433218
diff --git a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map
deleted file mode 100644
index 922e5404..00000000
--- a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a46d673b967335af347b2d5418e29f0a88a67d851339ed32c6468ab0db29025
-size 5851293
diff --git a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.br b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.br
deleted file mode 100644
index 37c0f5fd..00000000
--- a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.br
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ba89e39620d2992e2778804b1b68cf134c5b5c51b5530780ed6aeb24b5eeef26
-size 1255087
diff --git a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.gz b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.gz
deleted file mode 100644
index 120beedf..00000000
--- a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7926e560d43796d95f9635a7c57f7c8efcc162e1d1eb46798e41ccea3f90b2f4
-size 1551597
diff --git a/public/packs/manifest.json b/public/packs/manifest.json
deleted file mode 100644
index 6949dfb1..00000000
--- a/public/packs/manifest.json
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8b7d82687e0f68f4e2705ad8bea08ff7ebe1e998bd0f30fe82220ec6dc2edba
-size 1426
diff --git a/public/packs/manifest.json.br b/public/packs/manifest.json.br
deleted file mode 100644
index a409c567..00000000
--- a/public/packs/manifest.json.br
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:edb90be614388b1b288316fd44a7510e88e7705fee4a7abc99dd539e415b79ac
-size 320
diff --git a/public/packs/manifest.json.gz b/public/packs/manifest.json.gz
deleted file mode 100644
index 1646ab13..00000000
--- a/public/packs/manifest.json.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c82218f8743a4bdf1bc369bbd2df346bc90a4e62e08cadebd62efe3d01603a25
-size 365
diff --git a/public/packs/media/fonts/forkawesome-webfont-2dfb5f36.woff b/public/packs/media/fonts/forkawesome-webfont-2dfb5f36.woff
deleted file mode 100644
index 8925c5d3..00000000
--- a/public/packs/media/fonts/forkawesome-webfont-2dfb5f36.woff
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:53ab31062cf740aa76615d2c98aea80b177845d7ed95de45889b3824b0e1597c
-size 115148
diff --git a/public/packs/media/fonts/forkawesome-webfont-7c20758e.woff2 b/public/packs/media/fonts/forkawesome-webfont-7c20758e.woff2
deleted file mode 100644
index 52865bdb..00000000
--- a/public/packs/media/fonts/forkawesome-webfont-7c20758e.woff2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:84422de97eb1cf27bcb9bca4f3fbb18f3ebc711647b09c68292f5f43c89d5064
-size 91624
diff --git a/public/packs/media/fonts/forkawesome-webfont-86541105.svg b/public/packs/media/fonts/forkawesome-webfont-86541105.svg
deleted file mode 100644
index af45aadc..00000000
--- a/public/packs/media/fonts/forkawesome-webfont-86541105.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:505e7f9fe61ba6d17d8514b5d0c3a75166dab1b57527e2d3a3baf2047624ba93
-size 480784
diff --git a/public/packs/media/fonts/forkawesome-webfont-86541105.svg.br b/public/packs/media/fonts/forkawesome-webfont-86541105.svg.br
deleted file mode 100644
index 827ed0bc..00000000
--- a/public/packs/media/fonts/forkawesome-webfont-86541105.svg.br
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4df44c3056ab68d2e1cf1970189876295b62db1640e6ed885c78d8c46f94e66f
-size 126249
diff --git a/public/packs/media/fonts/forkawesome-webfont-86541105.svg.gz b/public/packs/media/fonts/forkawesome-webfont-86541105.svg.gz
deleted file mode 100644
index 0676bab5..00000000
--- a/public/packs/media/fonts/forkawesome-webfont-86541105.svg.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49664085aa6a37335724f0288531562f352e81d10fdfeadd4a8ed0764eae2f50
-size 160947
diff --git a/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot b/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot
deleted file mode 100644
index 37e93df5..00000000
--- a/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d96fdd7d6854cf875ce3090e017b0078ae2f7e923763bcbb90748a01c6fb7fd
-size 188946
diff --git a/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.br b/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.br
deleted file mode 100644
index 01f63da2..00000000
--- a/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.br
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36cb46345792080af5dbe8bd742dc632a3821276fff76e57877c93c0e8afb00a
-size 107072
diff --git a/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.gz b/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.gz
deleted file mode 100644
index 5bb32cdc..00000000
--- a/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:413b68fbd4bc71d5aa98410c6f8048f971b55e7d824180d0fab665cc55c3d9a3
-size 115772
diff --git a/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf b/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf
deleted file mode 100644
index e6380d0e..00000000
--- a/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e4beb40f0cc19ec55f2ab741d42e806fc6155ccf6e40e50965196c0bcc6aba4
-size 188756
diff --git a/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.br b/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.br
deleted file mode 100644
index c35abc27..00000000
--- a/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.br
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de3e4f20e5341214cc1292a61d0f49d833187e862fb1fbfeb746d25f0465ee6b
-size 106884
diff --git a/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.gz b/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.gz
deleted file mode 100644
index 44d9de5a..00000000
--- a/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26c357b09eb784753afcd35a1aa47fe65378a52c95db0496e98dfb999c9ab1b8
-size 115685
diff --git a/public/packs/media/images/layers-2x-8f2c4d11.png b/public/packs/media/images/layers-2x-8f2c4d11.png
deleted file mode 100644
index d3cf7e52..00000000
--- a/public/packs/media/images/layers-2x-8f2c4d11.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:066daca850d8ffbef007af00b06eac0015728dee279c51f3cb6c716df7c42edf
-size 1259
diff --git a/public/packs/media/images/layers-416d9136.png b/public/packs/media/images/layers-416d9136.png
deleted file mode 100644
index 7b44754c..00000000
--- a/public/packs/media/images/layers-416d9136.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1dbbe9d028e292f36fcba8f8b3a28d5e8932754fc2215b9ac69e4cdecf5107c6
-size 696
diff --git a/public/packs/media/images/marker-icon-2b3e1faf.png b/public/packs/media/images/marker-icon-2b3e1faf.png
deleted file mode 100644
index b1789c76..00000000
--- a/public/packs/media/images/marker-icon-2b3e1faf.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:574c3a5cca85f4114085b6841596d62f00d7c892c7b03f28cbfa301deb1dc437
-size 1466
diff --git a/public/packs/media/images/marker-icon-2x-680f69f3.png b/public/packs/media/images/marker-icon-2x-680f69f3.png
deleted file mode 100644
index 09e8445f..00000000
--- a/public/packs/media/images/marker-icon-2x-680f69f3.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:00179c4c1ee830d3a108412ae0d294f55776cfeb085c60129a39aa6fc4ae2528
-size 2464
diff --git a/public/packs/media/images/marker-shadow-a0c6cc14.png b/public/packs/media/images/marker-shadow-a0c6cc14.png
deleted file mode 100644
index dc111216..00000000
--- a/public/packs/media/images/marker-shadow-a0c6cc14.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:264f5c640339f042dd729062cfc04c17f8ea0f29882b538e3848ed8f10edb4da
-size 618

From 024b8054c3cf9e43110fc68be16f5603f2804860 Mon Sep 17 00:00:00 2001
From: Sutty <sutty@sutty.nl>
Date: Thu, 30 Nov 2023 16:45:49 +0000
Subject: [PATCH 13/14] Revert "ci: assets [skip ci]"

This reverts commit c5da02cf3edb20567674bcf697fcd524bc19f182.
---
 .../.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json  | 2 +-
 public/packs/css/application-bb1478c7.css                      | 3 +++
 public/packs/css/application-bb1478c7.css.br                   | 3 +++
 public/packs/css/application-bb1478c7.css.gz                   | 3 +++
 public/packs/js/application-17c8ec1abff8d9ee68fc.js            | 3 +++
 .../packs/js/application-17c8ec1abff8d9ee68fc.js.LICENSE.txt   | 3 +++
 public/packs/js/application-17c8ec1abff8d9ee68fc.js.br         | 3 +++
 public/packs/js/application-17c8ec1abff8d9ee68fc.js.gz         | 3 +++
 public/packs/js/application-17c8ec1abff8d9ee68fc.js.map        | 3 +++
 public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.br     | 3 +++
 public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.gz     | 3 +++
 public/packs/manifest.json                                     | 3 +++
 public/packs/manifest.json.br                                  | 3 +++
 public/packs/manifest.json.gz                                  | 3 +++
 public/packs/media/fonts/forkawesome-webfont-2dfb5f36.woff     | 3 +++
 public/packs/media/fonts/forkawesome-webfont-7c20758e.woff2    | 3 +++
 public/packs/media/fonts/forkawesome-webfont-86541105.svg      | 3 +++
 public/packs/media/fonts/forkawesome-webfont-86541105.svg.br   | 3 +++
 public/packs/media/fonts/forkawesome-webfont-86541105.svg.gz   | 3 +++
 public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot      | 3 +++
 public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.br   | 3 +++
 public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.gz   | 3 +++
 public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf      | 3 +++
 public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.br   | 3 +++
 public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.gz   | 3 +++
 public/packs/media/images/layers-2x-8f2c4d11.png               | 3 +++
 public/packs/media/images/layers-416d9136.png                  | 3 +++
 public/packs/media/images/marker-icon-2b3e1faf.png             | 3 +++
 public/packs/media/images/marker-icon-2x-680f69f3.png          | 3 +++
 public/packs/media/images/marker-shadow-a0c6cc14.png           | 3 +++
 30 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 public/packs/css/application-bb1478c7.css
 create mode 100644 public/packs/css/application-bb1478c7.css.br
 create mode 100644 public/packs/css/application-bb1478c7.css.gz
 create mode 100644 public/packs/js/application-17c8ec1abff8d9ee68fc.js
 create mode 100644 public/packs/js/application-17c8ec1abff8d9ee68fc.js.LICENSE.txt
 create mode 100644 public/packs/js/application-17c8ec1abff8d9ee68fc.js.br
 create mode 100644 public/packs/js/application-17c8ec1abff8d9ee68fc.js.gz
 create mode 100644 public/packs/js/application-17c8ec1abff8d9ee68fc.js.map
 create mode 100644 public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.br
 create mode 100644 public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.gz
 create mode 100644 public/packs/manifest.json
 create mode 100644 public/packs/manifest.json.br
 create mode 100644 public/packs/manifest.json.gz
 create mode 100644 public/packs/media/fonts/forkawesome-webfont-2dfb5f36.woff
 create mode 100644 public/packs/media/fonts/forkawesome-webfont-7c20758e.woff2
 create mode 100644 public/packs/media/fonts/forkawesome-webfont-86541105.svg
 create mode 100644 public/packs/media/fonts/forkawesome-webfont-86541105.svg.br
 create mode 100644 public/packs/media/fonts/forkawesome-webfont-86541105.svg.gz
 create mode 100644 public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot
 create mode 100644 public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.br
 create mode 100644 public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.gz
 create mode 100644 public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf
 create mode 100644 public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.br
 create mode 100644 public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.gz
 create mode 100644 public/packs/media/images/layers-2x-8f2c4d11.png
 create mode 100644 public/packs/media/images/layers-416d9136.png
 create mode 100644 public/packs/media/images/marker-icon-2b3e1faf.png
 create mode 100644 public/packs/media/images/marker-icon-2x-680f69f3.png
 create mode 100644 public/packs/media/images/marker-shadow-a0c6cc14.png

diff --git a/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json b/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json
index 9da8ba55..6d1b664d 100644
--- a/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json
+++ b/public/assets/.sprockets-manifest-a1cbb907961024fc033716a7d30668dd.json
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0be27a81c40641903cee5772ab6ff0064db2ce35438c58b264fa1c0accb9073c
+oid sha256:e0bd21756fd55d772a0d310db827bd41b2d1fbdd6d6924ad212803ed33971725
 size 14525
diff --git a/public/packs/css/application-bb1478c7.css b/public/packs/css/application-bb1478c7.css
new file mode 100644
index 00000000..00ee9254
--- /dev/null
+++ b/public/packs/css/application-bb1478c7.css
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8fd3bb412b63723fe63fa107ffac78bd6396487ccd69e4ea6d098848739a075d
+size 49279
diff --git a/public/packs/css/application-bb1478c7.css.br b/public/packs/css/application-bb1478c7.css.br
new file mode 100644
index 00000000..0b1db25e
--- /dev/null
+++ b/public/packs/css/application-bb1478c7.css.br
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:243e15e5a405fd51203d0fe34119c018691da4bfdd00be0cf26aa3e2abb5634d
+size 10005
diff --git a/public/packs/css/application-bb1478c7.css.gz b/public/packs/css/application-bb1478c7.css.gz
new file mode 100644
index 00000000..7cadc76e
--- /dev/null
+++ b/public/packs/css/application-bb1478c7.css.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3d0b479d7ebdc77c8ef3549085248c2b668a61fea1a1e3700bc918fe505c4ff
+size 12351
diff --git a/public/packs/js/application-17c8ec1abff8d9ee68fc.js b/public/packs/js/application-17c8ec1abff8d9ee68fc.js
new file mode 100644
index 00000000..37480493
--- /dev/null
+++ b/public/packs/js/application-17c8ec1abff8d9ee68fc.js
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11cb44a373f826146b847520f0dd20a7549d4fac1c5a90d1deac260b421e5c68
+size 1492424
diff --git a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.LICENSE.txt b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.LICENSE.txt
new file mode 100644
index 00000000..979d1ab9
--- /dev/null
+++ b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.LICENSE.txt
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3b9ae1697c4b8a404afe77afe035de28b7f4880e9f52caac82620bb8d8ed495
+size 854
diff --git a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.br b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.br
new file mode 100644
index 00000000..b357cdd6
--- /dev/null
+++ b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.br
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48ccffc31d33c10d77f4ae691a26b64c1398fe4ec86071ba01430a4bfbdc3c00
+size 326998
diff --git a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.gz b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.gz
new file mode 100644
index 00000000..f3d19ecd
--- /dev/null
+++ b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f4634538d756c8168c99dc53f33a593a99efd7f4e183ca2d4203883136e72ba2
+size 433218
diff --git a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map
new file mode 100644
index 00000000..922e5404
--- /dev/null
+++ b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1a46d673b967335af347b2d5418e29f0a88a67d851339ed32c6468ab0db29025
+size 5851293
diff --git a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.br b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.br
new file mode 100644
index 00000000..37c0f5fd
--- /dev/null
+++ b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.br
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba89e39620d2992e2778804b1b68cf134c5b5c51b5530780ed6aeb24b5eeef26
+size 1255087
diff --git a/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.gz b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.gz
new file mode 100644
index 00000000..120beedf
--- /dev/null
+++ b/public/packs/js/application-17c8ec1abff8d9ee68fc.js.map.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7926e560d43796d95f9635a7c57f7c8efcc162e1d1eb46798e41ccea3f90b2f4
+size 1551597
diff --git a/public/packs/manifest.json b/public/packs/manifest.json
new file mode 100644
index 00000000..6949dfb1
--- /dev/null
+++ b/public/packs/manifest.json
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8b7d82687e0f68f4e2705ad8bea08ff7ebe1e998bd0f30fe82220ec6dc2edba
+size 1426
diff --git a/public/packs/manifest.json.br b/public/packs/manifest.json.br
new file mode 100644
index 00000000..a409c567
--- /dev/null
+++ b/public/packs/manifest.json.br
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:edb90be614388b1b288316fd44a7510e88e7705fee4a7abc99dd539e415b79ac
+size 320
diff --git a/public/packs/manifest.json.gz b/public/packs/manifest.json.gz
new file mode 100644
index 00000000..1646ab13
--- /dev/null
+++ b/public/packs/manifest.json.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c82218f8743a4bdf1bc369bbd2df346bc90a4e62e08cadebd62efe3d01603a25
+size 365
diff --git a/public/packs/media/fonts/forkawesome-webfont-2dfb5f36.woff b/public/packs/media/fonts/forkawesome-webfont-2dfb5f36.woff
new file mode 100644
index 00000000..8925c5d3
--- /dev/null
+++ b/public/packs/media/fonts/forkawesome-webfont-2dfb5f36.woff
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53ab31062cf740aa76615d2c98aea80b177845d7ed95de45889b3824b0e1597c
+size 115148
diff --git a/public/packs/media/fonts/forkawesome-webfont-7c20758e.woff2 b/public/packs/media/fonts/forkawesome-webfont-7c20758e.woff2
new file mode 100644
index 00000000..52865bdb
--- /dev/null
+++ b/public/packs/media/fonts/forkawesome-webfont-7c20758e.woff2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:84422de97eb1cf27bcb9bca4f3fbb18f3ebc711647b09c68292f5f43c89d5064
+size 91624
diff --git a/public/packs/media/fonts/forkawesome-webfont-86541105.svg b/public/packs/media/fonts/forkawesome-webfont-86541105.svg
new file mode 100644
index 00000000..af45aadc
--- /dev/null
+++ b/public/packs/media/fonts/forkawesome-webfont-86541105.svg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:505e7f9fe61ba6d17d8514b5d0c3a75166dab1b57527e2d3a3baf2047624ba93
+size 480784
diff --git a/public/packs/media/fonts/forkawesome-webfont-86541105.svg.br b/public/packs/media/fonts/forkawesome-webfont-86541105.svg.br
new file mode 100644
index 00000000..827ed0bc
--- /dev/null
+++ b/public/packs/media/fonts/forkawesome-webfont-86541105.svg.br
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4df44c3056ab68d2e1cf1970189876295b62db1640e6ed885c78d8c46f94e66f
+size 126249
diff --git a/public/packs/media/fonts/forkawesome-webfont-86541105.svg.gz b/public/packs/media/fonts/forkawesome-webfont-86541105.svg.gz
new file mode 100644
index 00000000..0676bab5
--- /dev/null
+++ b/public/packs/media/fonts/forkawesome-webfont-86541105.svg.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49664085aa6a37335724f0288531562f352e81d10fdfeadd4a8ed0764eae2f50
+size 160947
diff --git a/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot b/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot
new file mode 100644
index 00000000..37e93df5
--- /dev/null
+++ b/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d96fdd7d6854cf875ce3090e017b0078ae2f7e923763bcbb90748a01c6fb7fd
+size 188946
diff --git a/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.br b/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.br
new file mode 100644
index 00000000..01f63da2
--- /dev/null
+++ b/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.br
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36cb46345792080af5dbe8bd742dc632a3821276fff76e57877c93c0e8afb00a
+size 107072
diff --git a/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.gz b/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.gz
new file mode 100644
index 00000000..5bb32cdc
--- /dev/null
+++ b/public/packs/media/fonts/forkawesome-webfont-e182ad6d.eot.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:413b68fbd4bc71d5aa98410c6f8048f971b55e7d824180d0fab665cc55c3d9a3
+size 115772
diff --git a/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf b/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf
new file mode 100644
index 00000000..e6380d0e
--- /dev/null
+++ b/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e4beb40f0cc19ec55f2ab741d42e806fc6155ccf6e40e50965196c0bcc6aba4
+size 188756
diff --git a/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.br b/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.br
new file mode 100644
index 00000000..c35abc27
--- /dev/null
+++ b/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.br
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de3e4f20e5341214cc1292a61d0f49d833187e862fb1fbfeb746d25f0465ee6b
+size 106884
diff --git a/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.gz b/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.gz
new file mode 100644
index 00000000..44d9de5a
--- /dev/null
+++ b/public/packs/media/fonts/forkawesome-webfont-ee4d8bfd.ttf.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26c357b09eb784753afcd35a1aa47fe65378a52c95db0496e98dfb999c9ab1b8
+size 115685
diff --git a/public/packs/media/images/layers-2x-8f2c4d11.png b/public/packs/media/images/layers-2x-8f2c4d11.png
new file mode 100644
index 00000000..d3cf7e52
--- /dev/null
+++ b/public/packs/media/images/layers-2x-8f2c4d11.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:066daca850d8ffbef007af00b06eac0015728dee279c51f3cb6c716df7c42edf
+size 1259
diff --git a/public/packs/media/images/layers-416d9136.png b/public/packs/media/images/layers-416d9136.png
new file mode 100644
index 00000000..7b44754c
--- /dev/null
+++ b/public/packs/media/images/layers-416d9136.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1dbbe9d028e292f36fcba8f8b3a28d5e8932754fc2215b9ac69e4cdecf5107c6
+size 696
diff --git a/public/packs/media/images/marker-icon-2b3e1faf.png b/public/packs/media/images/marker-icon-2b3e1faf.png
new file mode 100644
index 00000000..b1789c76
--- /dev/null
+++ b/public/packs/media/images/marker-icon-2b3e1faf.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:574c3a5cca85f4114085b6841596d62f00d7c892c7b03f28cbfa301deb1dc437
+size 1466
diff --git a/public/packs/media/images/marker-icon-2x-680f69f3.png b/public/packs/media/images/marker-icon-2x-680f69f3.png
new file mode 100644
index 00000000..09e8445f
--- /dev/null
+++ b/public/packs/media/images/marker-icon-2x-680f69f3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00179c4c1ee830d3a108412ae0d294f55776cfeb085c60129a39aa6fc4ae2528
+size 2464
diff --git a/public/packs/media/images/marker-shadow-a0c6cc14.png b/public/packs/media/images/marker-shadow-a0c6cc14.png
new file mode 100644
index 00000000..dc111216
--- /dev/null
+++ b/public/packs/media/images/marker-shadow-a0c6cc14.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:264f5c640339f042dd729062cfc04c17f8ea0f29882b538e3848ed8f10edb4da
+size 618

From 89063d50c02a3627da5b1e820764dabe9dfe5e7f Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 4 Dec 2023 17:50:53 -0300
Subject: [PATCH 14/14] fix: no cambiar el nombre de dominio #14746

---
 app/models/site.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/site.rb b/app/models/site.rb
index a8c5e376..c40dd6f9 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -501,8 +501,8 @@ class Site < ApplicationRecord
     config.theme = design.gem unless design.no_theme?
     config.description = description
     config.title = title
-    config.url = url(slash: false)
-    config.hostname = hostname
+    config.url ||= url(slash: false)
+    config.hostname ||= hostname
     config.locales = locales.map(&:to_s)
   end