Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

TAM
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

f220b084

Commit f220b084 authored Nov 29, 2023 by Ruben Backx

Downloads
- Plain Diff

Merge branch '202-show-salary-scale-on-search-people-page' into 'dev'

Resolve "Show salary scale on search people page"

Closes #202

See merge request !346

parents 2e56d528 72a282a6

2 merge requests!348Deploy fix,!346Resolve "Show salary scale on search people page"

Checking pipeline status

Changes 4
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
src/main/java/nl/tudelft/tam/controller/PersonController.java 1 addition, 1 deletion

...main/java/nl/tudelft/tam/controller/PersonController.java
src/main/resources/templates/person/search.html 8 additions, 6 deletions

src/main/resources/templates/person/search.html
src/test/java/nl/tudelft/tam/controller/PersonControllerTest.java 12 additions, 8 deletions

.../java/nl/tudelft/tam/controller/PersonControllerTest.java

with 22 additions and 15 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