From eb80a83ddd17b31d7dcf0a2cff634a3b593d8230 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 9 May 2024 12:01:34 -0300
Subject: [PATCH 1/5] fix: editor 0.1.29

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index eea0473f..088316bc 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "@rails/activestorage": "^6.1.3-1",
     "@rails/ujs": "^6.1.3-1",
     "@rails/webpacker": "5.4.4",
-    "@suttyweb/editor": "^0.1.27",
+    "@suttyweb/editor": "^0.1.29",
     "babel-loader": "^8.2.2",
     "bs-custom-file-input": "^1.3.4",
     "chart.js": "^3.5.1",
diff --git a/yarn.lock b/yarn.lock
index 7a81a221..fc6ae7cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1975,10 +1975,10 @@
   resolved "https://registry.npmjs.org/@stimulus/webpack-helpers/-/webpack-helpers-1.1.1.tgz"
   integrity sha512-XOkqSw53N9072FLHvpLM25PIwy+ndkSSbnTtjKuyzsv8K5yfkFB2rv68jU1pzqYa9FZLcvZWP4yazC0V38dx9A==
 
-"@suttyweb/editor@^0.1.27":
-  version "0.1.27"
-  resolved "https://registry.yarnpkg.com/@suttyweb/editor/-/editor-0.1.27.tgz#9415a0b767e72dbe4fbf42ce87e62fb8f5125c31"
-  integrity sha512-Ts9TZtGiRIaHm+ffVBRl+/nuVcANWZNtFsrGacoajgEsagaIyA1cq8qjiNpPoM5ne9vTba3cAaLP04V/uEIhBw==
+"@suttyweb/editor@^0.1.29":
+  version "0.1.29"
+  resolved "https://registry.yarnpkg.com/@suttyweb/editor/-/editor-0.1.29.tgz#8b5c6ae4e4d546002a96ecd65765d77d2a88d415"
+  integrity sha512-GshI8wE5UqXge2RhwAUxUXTRLPoOX7US9xVu1aLqT/deT/hDyN9S3PxVn9cJBf7uPHEqBzYXGDKWWF79PLqGHw==
   dependencies:
     "@floating-ui/dom" "^1.5.1"
     linkifyjs "^4.1.1"

From 6972aafa75dd64e2195194c78d8bee2842754d33 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 9 May 2024 12:03:38 -0300
Subject: [PATCH 2/5] ci: pushear assets

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a906fc2a..0cf09b87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ assets:
   - "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_CI_PUSH_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git\""
+  - "git remote set-url --push origin \"https://GITLAB_CI_PUSH_TOKEN:${GITLAB_CI_PUSH_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"

From 0d1ca35e6b4da250b73e4a247f23a0f454573038 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 9 May 2024 12:18:25 -0300
Subject: [PATCH 3/5] ci: probar que podemos pushear!

---
 .gitlab-ci.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0cf09b87..f736a316 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,19 @@ variables:
   LC_ALL: "C.UTF-8"
   HAINISH: ""
 cache:
+push:
+  stage: "deploy"
+  only:
+  - "rails"
+  except:
+  - "schedules"
+  before_script:
+  - "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_CI_PUSH_TOKEN:${GITLAB_CI_PUSH_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git\""
+  script:
+  - "git commit --allow-empty -m \"ci: test [skip ci]\""
+  - "git push -o ci.skip origin HEAD:${CI_COMMIT_BRANCH}"
 assets:
   stage: "deploy"
   only:

From 2407ec11d9766297cac44eb3675f4792cf2559b2 Mon Sep 17 00:00:00 2001
From: fauno <fauno@endefensadelsl.org>
Date: Thu, 9 May 2024 15:19:09 +0000
Subject: [PATCH 4/5] ci: test [skip ci]


From 088b495ed394b07ca65b1c74aed255e1088da55a Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 9 May 2024 12:20:55 -0300
Subject: [PATCH 5/5] ci: fallar temprano si ya no se puede pushear

---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f736a316..c72a632d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,6 @@
+stages:
+- "test"
+- "deploy"
 .apk-add: &apk-add
 - "apk add go-task diffutils gitlab_ci_log_section"
 .disable-hainish: &disable-hainish
@@ -25,7 +28,7 @@ variables:
   HAINISH: ""
 cache:
 push:
-  stage: "deploy"
+  stage: "test"
   only:
   - "rails"
   except: