aleksis/AlekSIS
8
0
Fork 0
Code Issues 38 Pull requests 17 Projects Releases 6 Packages 1 Wiki Activity Actions

WIP: Draft: Update and modernise compose #410

Draft
nik wants to merge 3 commits from compose-update into master
pull from: compose-update
merge into: aleksis:master
Conversation 2 Commits 3 Files changed 2 +5 -3
nik commented 2025-12-20 11:58:00 +01:00 (Migrated from edugit.org)
Copy link
No description provided.
nik commented 2025-12-20 11:58:00 +01:00 (Migrated from edugit.org)
Copy link

assigned to @nik

assigned to @nik
nik commented 2025-12-20 13:41:30 +01:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 57f16242 - Use explicit Postgres version in compose

Compare with previous version

added 1 commit <ul><li>57f16242 - Use explicit Postgres version in compose</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS/-/merge_requests/306/diffs?diff_id=79723&start_sha=6c87a7a858893389cc8823573f6379f7759b89c0)
This pull request has changes conflicting with the target branch.
  • Containerfile
  • compose.yml
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

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

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff compose-update
git switch compose-update
git rebase master
git switch master
git merge --ff-only compose-update
git switch compose-update
git rebase master
git switch master
git merge --no-ff compose-update
git switch master
git merge --squash compose-update
git switch master
git merge --ff-only compose-update
git switch master
git merge compose-update
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Security

   
TeX
Needs LaTeX template

  
board
done

  
board
ready

  
board
todo

  
part
backend
 Backend (view code, models, logic, etc.)

  
part
ci

  
part
docs
 Issue or addition to the documentation

  
part
frontend
 Frontend (templates, etc.)

  
part
i18n
 Translation or internationalisation issue

  
part
non-technical
 Non-technical (policy, maintenance, etc.) issue or discussion

  
part
packaging
 Issue concerning the packaging of AlekSIS and components

  
prio
1
 Priority High

  
prio
2
 Priority Medium

  
prio
3
 Priority Low

  
release-mr-5.x
  
size
large

  
size
medium

  
size
small

  
source
customer
 Requested by a customer or affiliated user

  
source
customer::fsmw

  
source
customer::fss

  
source
customer::teckids

  
source
downstream
 Issue or merge request from other projects using AlekSIS or parts of it

  
type
breaking

  
type
bug
 Bug

  
type
feature
 New feature

  
type
refactoring

  
workflow
blocked
 Issue is blocked by another issue

  
workflow
confirmed
 The bug is reproducible and will be fixed

  
workflow
current-todo

  
workflow
discussing
 Needs to be discussed before implementation

  
workflow
new-app
 Requires new AlekSIS app, which has to be created

  
workflow
wontfix
 The bug is not reproducible or the feature was decided against

No labels
Security
TeX
board
done
board
ready
board
todo
part
backend
part
ci
part
docs
part
frontend
part
i18n
part
non-technical
part
packaging
prio
1
prio
2
prio
3
release-mr-5.x
size
large
size
medium
size
small
source
customer
source
customer::fsmw
source
customer::fss
source
customer::teckids
source
downstream
type
breaking
type
bug
type
feature
type
refactoring
workflow
blocked
workflow
confirmed
workflow
current-todo
workflow
discussing
workflow
new-app
workflow
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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
aleksis/AlekSIS!410
No description provided.