Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

B

backend
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

11c9b98c

Commit 11c9b98c authored 1 year ago by heikkkk

Downloads
- Plain Diff

Merge branch 'master' of...

Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/idatt2106-2024-07/backend into feat/model-classes

 Conflicts:
	.gitlab-ci.yml

parents d7a05d42 7d2ba308

Branches feat/model-classes

No related tags found

1 merge request!6Feat/model classes

Pipeline #274082 passed 1 year ago

Stage: compile_and_test

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 56 additions, 14 deletions

.gitlab-ci.yml
pom.xml 48 additions, 2 deletions

pom.xml
scripts/add_jacoco_coverage_link_to_html.py 50 additions, 0 deletions

scripts/add_jacoco_coverage_link_to_html.py
src/main/java/no/ntnu/idi/stud/savingsapp/model/user/User.java 1 addition, 1 deletion

...ain/java/no/ntnu/idi/stud/savingsapp/model/user/User.java
src/main/resources/application-gitlab-ci.yml 25 additions, 0 deletions

src/main/resources/application-gitlab-ci.yml
src/main/resources/application.yml 0 additions, 0 deletions

src/main/resources/application.yml
src/test/java/no/ntnu/idi/stud/savingsapp/DemoApplicationTests.java 0 additions, 9 deletions

...ava/no/ntnu/idi/stud/savingsapp/DemoApplicationTests.java

with 180 additions and 26 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