data.coop/ansible
8
3
Fork 7
Code Issues 51 Pull requests 9 Projects 1 Releases Wiki Activity

WIP: Linting #128

Draft
valberg wants to merge 5 commits from linting into main
pull from: linting
merge into: data.coop:main
Conversation 1 Commits 5 Files changed 44 +772 -730
valberg commented 2022-11-26 08:56:37 +00:00
Owner
Copy link
No description provided.
👍 1
valberg added 1 commit 2022-11-26 08:56:37 +00:00
valberg added 1 commit 2022-11-26 09:48:24 +00:00
samsapti added 1 commit 2022-11-26 20:36:46 +00:00
samsapti added 1 commit 2022-11-26 20:40:29 +00:00 
This reverts commit 7df888f633.
samsapti added 1 commit 2022-11-26 20:54:18 +00:00
samsapti changed title from Linting to WIP: Linting 2023-01-06 13:25:17 +00:00
samsapti commented 2023-12-12 20:12:13 +00:00
Owner
Copy link

This needs to be rebased onto main due to major changes since this was started.

This needs to be rebased onto `main` due to major changes since this was started.
This pull request has changes conflicting with the target branch.
  • group_vars/all/vars.yml
  • playbook.yml
  • roles/docker/defaults/main.yml
  • roles/docker/handlers/main.yml
  • roles/docker/tasks/main.yml
  • roles/docker/tasks/services.yml
  • roles/docker/tasks/services/codimd.yml
  • roles/docker/tasks/services/docker_registry.yml
  • roles/docker/tasks/services/drone.yml
  • roles/docker/tasks/services/gitea.yml
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin linting:linting
git checkout linting

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff linting
git checkout main
git merge --ff-only linting
git checkout linting
git rebase main
git checkout main
git merge --no-ff linting
git checkout main
git merge --squash linting
git checkout main
git merge --ff-only linting
git checkout main
git merge linting
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Blocked

Something is blocking progress

  
Existing Service

Issues/improvements regarding existing services

  
Infrastructure Issue

Infrastructure issue that needs investigation or time to fix

  
Refactor

Refactoring of files / file structure or other improvements

  
Security Hardening

Non-verified / non-critical security improvements

  
Security Issue

Urgent security issue that needs to be fixed ASAP

  
Service Idea

Ideas for new services

  
Service Removal

Removal of services for one reason or another

  
Upgrade service
No labels
Blocked
Existing Service
Infrastructure Issue
Refactor
Security Hardening
Security Issue
Service Idea
Service Removal
Upgrade service
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
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: data.coop/ansible#128
No description provided.
Delete branch "linting"

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?