Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

STS
- Activity
- Members
- Labels
- Wiki
- Environments
- Terraform modules

Snippets Groups Projects

e1bf5a45

Commit e1bf5a45 authored 4 years ago by Marcel Nellesen

Downloads
- Plain Diff

Merge branch 'Sprint/2020-11' into 'master'

Sprint/2020 11

See merge request coscine/api/sts!51

parents 1cd9f4b2 35bc5285

Branches

Tags v1.13.0

1 merge request!51Sprint/2020 11

Changes 7
Pipelines 5

Hide whitespace changes

Inline Side-by-side

Showing

src/STS/Controllers/AccountController.cs 4 additions, 1 deletion

src/STS/Controllers/AccountController.cs
src/STS/Controllers/HomeController.cs 16 additions, 6 deletions

src/STS/Controllers/HomeController.cs
src/STS/Controllers/MergeController.cs 119 additions, 0 deletions

src/STS/Controllers/MergeController.cs
src/STS/Controllers/ShibbolethController.cs 2 additions, 3 deletions

src/STS/Controllers/ShibbolethController.cs
src/STS/STS.csproj 2 additions, 2 deletions

src/STS/STS.csproj
src/STS/Utils/MergeUtil.cs 137 additions, 0 deletions

src/STS/Utils/MergeUtil.cs
src/STS/Utils/UrlGenerator.cs 10 additions, 0 deletions

src/STS/Utils/UrlGenerator.cs

with 290 additions and 12 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