Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Submit
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Terraform modules
- Contributor analytics
- Model experiments

Snippets Groups Projects

EIP
Labrador
Submit
Commits
fa6638e8

Commit fa6638e8 authored Nov 5, 2020 by Otto Visser

Downloads
- Plain Diff

Merge branch 'pre-master-merge-fixes' into 'development'

Pre master merge fixes

See merge request !68

parents c94d3f69 be916f6d

Branches

Tags

2 merge requests!68Pre master merge fixes,!67Development

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

src/main/java/nl/tudelft/submit/controller/EditionController.java 0 additions, 6 deletions

.../java/nl/tudelft/submit/controller/EditionController.java
src/main/java/nl/tudelft/submit/controller/GradeController.java 2 additions, 38 deletions

...in/java/nl/tudelft/submit/controller/GradeController.java
src/main/java/nl/tudelft/submit/dto/helper/GradeExportOptions.java 3 additions, 3 deletions

...java/nl/tudelft/submit/dto/helper/GradeExportOptions.java
src/main/java/nl/tudelft/submit/service/ExportService.java 12 additions, 10 deletions

src/main/java/nl/tudelft/submit/service/ExportService.java
src/main/java/nl/tudelft/submit/service/GradeService.java 35 additions, 0 deletions

src/main/java/nl/tudelft/submit/service/GradeService.java
src/main/resources/application.template.yaml 2 additions, 2 deletions

src/main/resources/application.template.yaml
src/test/java/nl/tudelft/submit/controller/GradeControllerTest.java 7 additions, 71 deletions

...ava/nl/tudelft/submit/controller/GradeControllerTest.java
src/test/java/nl/tudelft/submit/service/ExportServiceTest.java 2 additions, 2 deletions

...est/java/nl/tudelft/submit/service/ExportServiceTest.java

with 63 additions and 132 deletions

Loading

0% Loading or .

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

Finish editing this message first!

Please sign in to comment