From 8b07d0201ee57838dc3f65a7b5f172d157b5de0c Mon Sep 17 00:00:00 2001
From: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Thu, 23 May 2024 08:36:15 +0000
Subject: [PATCH 1/4] Update gitlab CI file to avoid arm runner that keeps
 failing certain resource-intensive tasks

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b4452d53..25e499c4c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,6 +43,8 @@ lint:
 
 test:
   stage: test
+  tags:
+    - amd64
   variables:
     APT_CACHE_DIR: apt-cache
   script:
@@ -54,6 +56,8 @@ test:
 
 build:
   stage: build
+  tags:
+    - amd64
   script:
     - yarn
     - npm run build

From 5810f6f4318e65d51f004d89259c37182945c422 Mon Sep 17 00:00:00 2001
From: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Thu, 23 May 2024 08:38:17 +0000
Subject: [PATCH 2/4] changelog

---
 changelog.d/ci-runner.skip | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/ci-runner.skip

diff --git a/changelog.d/ci-runner.skip b/changelog.d/ci-runner.skip
new file mode 100644
index 000000000..ad4b79d52
--- /dev/null
+++ b/changelog.d/ci-runner.skip
@@ -0,0 +1 @@
+stop using that one runner for intensive tasks
\ No newline at end of file

From 3da6f8a2d165e9e0ed3d55c1fe99ee3441f08bb8 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 31 May 2024 09:38:42 -0400
Subject: [PATCH 3/4] Ensure selection text color has enough contrast

---
 changelog.d/no-preserve-selection-color.fix | 1 +
 src/components/root.style.js                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/no-preserve-selection-color.fix

diff --git a/changelog.d/no-preserve-selection-color.fix b/changelog.d/no-preserve-selection-color.fix
new file mode 100644
index 000000000..669e744cc
--- /dev/null
+++ b/changelog.d/no-preserve-selection-color.fix
@@ -0,0 +1 @@
+Ensure selection text color has enough contrast
diff --git a/src/components/root.style.js b/src/components/root.style.js
index 3e840a520..f9bdf16e8 100644
--- a/src/components/root.style.js
+++ b/src/components/root.style.js
@@ -37,7 +37,7 @@ export default {
 
         // Selection colors
         '--selectionBackground': 'color | --accent',
-        '--selectionText': 'color | $textColor(--accent, --text)'
+        '--selectionText': 'color | $textColor(--accent, --text, no-preserve)'
       }
     }
   ]

From 631c2532aafdfcbdb19ea3d48c9ce143ce7ef376 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Fri, 7 Jun 2024 10:54:55 -0400
Subject: [PATCH 4/4] Fix profile mentions causing a 422 error

The Pleroma backend now reports an error when trying to reply to a status it cannot resolve we assume it is deleted or nonexistent. PleromaFE was in_reply_to_id: true as an internal method to trigger populating the post status form with the username of the profile being viewed and this was being submitted to the API as a result.
---
 changelog.d/profile-mentions.fix                    | 1 +
 src/components/post_status_form/post_status_form.js | 5 +++--
 src/components/user_card/user_card.js               | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/profile-mentions.fix

diff --git a/changelog.d/profile-mentions.fix b/changelog.d/profile-mentions.fix
new file mode 100644
index 000000000..3f38ab0c4
--- /dev/null
+++ b/changelog.d/profile-mentions.fix
@@ -0,0 +1 @@
+Fix profile mentions causing a 422 error
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 5564b118e..563dfb966 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -87,7 +87,8 @@ const PostStatusForm = {
     'fileLimit',
     'submitOnEnter',
     'emojiPickerPlacement',
-    'optimisticPosting'
+    'optimisticPosting',
+    'profileMention'
   ],
   emits: [
     'posted',
@@ -125,7 +126,7 @@ const PostStatusForm = {
 
     const { scopeCopy } = this.$store.getters.mergedConfig
 
-    if (this.replyTo) {
+    if (this.replyTo || this.profileMention) {
       const currentUser = this.$store.state.users.currentUser
       statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
     }
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index e17bf8eb2..b1fe2e8f3 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -225,7 +225,7 @@ export default {
       this.$store.dispatch('setCurrentMedia', attachment)
     },
     mentionUser () {
-      this.$store.dispatch('openPostStatusModal', { replyTo: true, repliedUser: this.user })
+      this.$store.dispatch('openPostStatusModal', { profileMention: true, repliedUser: this.user })
     },
     onAvatarClickHandler (e) {
       if (this.onAvatarClick) {