use trim

woodpecker-ci · Jan 19, 2025 · 11866b4 · 11866b4
1 parent 1968c73
commit 11866b4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/server/store/datastore/migration/024_update_pipeline_messages.go b/server/store/datastore/migration/024_update_pipeline_messages.go
@@ -117,14 +117,14 @@ var updatePipelineMessages = xormigrate.Migration{
 					newPipeline.PullRequest = &pullRequest{
 						Title: oldPipeline.Title,
 						Index: model.ForgeRemoteID(
-							strings.ReplaceAll(
-								strings.ReplaceAll(
-									strings.ReplaceAll(
-										strings.ReplaceAll(oldPipeline.Ref, "refs/pull/", ""),
-										"refs/merge-requests/", "",
+							strings.TrimSuffix(
+								strings.TrimSuffix(
+									strings.TrimPrefix(
+										strings.TrimPrefix(oldPipeline.Ref, "refs/pull/"),
+										"refs/merge-requests/",
 									),
-									"/merge", ""),
-								"/head", "",
+									"/merge"),
+								"/head",
 							),
 						),
 						FromFork: oldPipeline.FromFork,

diff --git a/web/src/components/repo/pipeline/PipelineItem.vue b/web/src/components/repo/pipeline/PipelineItem.vue
@@ -23,7 +23,7 @@
         <img v-else class="w-6 rounded-md" :src="pipeline.author_avatar" />
       </div>
 
-      <div class="flex flex-col w-full min-w-0 md:mx-4 md:w-auto gap-y-2 justify-center">
+      <div class="flex flex-col w-full min-w-0 md:mx-4 md:w-auto gap-y-2 py-2">
         <div>
           <!-- eslint-disable-next-line @intlify/vue-i18n/no-raw-text -->
           <span class="md:display-unset hidden text-wp-text-alt-100">#{{ pipeline.number }}</span>