Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

frozen
- Activity
- Members
- Labels
- Environments
- Terraform modules

Snippets Groups Projects

c2f694ab

Commit c2f694ab authored 2 years ago by mikrats

Downloads
- Plain Diff

Merge branch 'main' into 'profile'

# Conflicts:
#   src/tjts5901/app.py
#   src/tjts5901/auth.py
#   src/tjts5901/models.py

parents 95dbc055 78bd5499

No related branches found

No related tags found

1 merge request!29profile page

Pipeline #14871 passed 2 years ago

Stage: build

Stage: test

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 3 additions, 0 deletions

.gitlab-ci.yml
src/tjts5901/app.py 13 additions, 2 deletions

src/tjts5901/app.py
src/tjts5901/auth.py 1 addition, 1 deletion

src/tjts5901/auth.py
src/tjts5901/models.py 22 additions, 6 deletions

src/tjts5901/models.py
src/tjts5901/templates/listBid.html 1 addition, 1 deletion

src/tjts5901/templates/listBid.html
src/tjts5901/test.jpeg 0 additions, 0 deletions

src/tjts5901/test.jpeg
src/tjts5901/views.py 15 additions, 6 deletions

src/tjts5901/views.py

with 55 additions and 16 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