Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AlekSIS-Core
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

340bde8b

Verified Commit 340bde8b authored 5 years ago by Nik | Klampfradler

Downloads
- Plain Diff

Merge branch 'master' of edugit.org:AlekSIS/official/AlekSIS

parents 7d0a8bc2 671c79f8

No related branches found

No related tags found

No related merge requests found

Pipeline #1068 failed 5 years ago

Stage: test

Stage: build

Stage: deploy

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

Dockerfile 1 addition, 1 deletion

Dockerfile
aleksis/core/forms.py 3 additions, 3 deletions

aleksis/core/forms.py
aleksis/core/migrations/0013_multiple_recipients_announcement.py 0 additions, 51 deletions

.../core/migrations/0013_multiple_recipients_announcement.py
aleksis/core/mixins.py 50 additions, 0 deletions

aleksis/core/mixins.py
aleksis/core/models.py 2 additions, 2 deletions

aleksis/core/models.py
aleksis/core/settings.py 1 addition, 0 deletions

aleksis/core/settings.py
aleksis/core/util/core_helpers.py 1 addition, 1 deletion

aleksis/core/util/core_helpers.py
docker-compose.yml 2 additions, 0 deletions

docker-compose.yml
docker/entrypoint.sh 2 additions, 0 deletions

docker/entrypoint.sh
docker/nginx/nginx.conf 8 additions, 3 deletions

docker/nginx/nginx.conf

with 70 additions and 61 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment