Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

steering
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

680669d2

Verified Commit 680669d2 authored 1 year ago by Ernesto Rico Schmidt

Downloads
- Plain Diff

Merge branch 'aep05' into extract-conflict-resolution

parents f28a880c 0edaefcc

No related branches found

No related tags found

No related merge requests found

Pipeline #3143 failed 1 year ago

Stage: build

Changes 13
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
fixtures/program/show.json 1 addition, 1 deletion

fixtures/program/show.json
poetry.lock 4 additions, 4 deletions

poetry.lock
program/filters.py 10 additions, 2 deletions

program/filters.py
program/migrations/0051_remove_show_logo.py 17 additions, 0 deletions

program/migrations/0051_remove_show_logo.py
program/migrations/0052_show_logo.py 19 additions, 0 deletions

program/migrations/0052_show_logo.py
program/migrations/0053_auto_20230411_1855.py 23 additions, 0 deletions

program/migrations/0053_auto_20230411_1855.py
program/models.py 10 additions, 3 deletions

program/models.py
program/serializers.py 67 additions, 15 deletions

program/serializers.py
program/tests/__init__.py 100 additions, 0 deletions

program/tests/__init__.py
program/tests/test_notes.py 124 additions, 0 deletions

program/tests/test_notes.py
program/views.py 35 additions, 76 deletions

program/views.py
steering/urls.py 4 additions, 4 deletions

steering/urls.py

with 415 additions and 105 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