verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 60 Releases Wiki Activity

fix conflicts #361

Merged
jorgep merged 5 commits from testToDev into dev 2024-05-07 14:37:08 +00:00
Conversation 0 Commits 5 Files Changed 2 +1 -11
jorgep commented 2024-05-07 14:25:09 +00:00
Member
Copy Link
No description provided.
jorgep added 5 commits 2024-05-07 14:25:52 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
0a71060f60 fix: refs #6938 workerCard
gitea/salix-front/pipeline/head There was a failure building this commit Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
ac0ebf431f Merge pull request '#6938 wamfix workerCard' (!357) from 6938-warmfix-masterToTest into test 
Reviewed-on: #357
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
gitea/salix-front/pipeline/pr-test This commit looks good Details
5e0db81a21 fix: refs #6938 conflicts
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
0e7c2c7118 Merge pull request '#6938-warmfix' (!359) from 6938-warmfix into test 
Reviewed-on: #359
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
jorgep requested review from carlosap 2024-05-07 14:26:48 +00:00
carlosap approved these changes 2024-05-07 14:36:16 +00:00
jorgep merged commit 613492d04a into dev 2024-05-07 14:37:08 +00:00
jorgep deleted branch testToDev 2024-05-07 14:37:08 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
carlosap
Labels
Clear labels   
bug

Something is not working

  
CR / Tests passed

CR / Tests passed

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
invalid

Something is wrong

  
Missing Tests

Missing Tests

  
wontfix

This won't be fixed

No Label
bug
CR / Tests passed
duplicate
enhancement
invalid
Missing Tests
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#361
No description provided.
Delete Branch "testToDev"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?