Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

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

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

a86eab9e

Commit a86eab9e authored 5 years ago by Marcel Nellesen

Downloads
- Plain Diff

Merge branch 'Sprint/201922-2' into 'master'

New: Included Mockup for bucket Application

See merge request coscine/api/project!46

parents aa44dd00 f50bd8f7

Branches Issue/2221-projectDateCreated

No related tags found

2 merge requests!50New: Included Mockup for bucket Application,!46New: Included Mockup for bucket Application

Changes 15
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

src/Project.Tests/DefaultControllerTests.cs 1 addition, 2 deletions

src/Project.Tests/DefaultControllerTests.cs
src/Project.Tests/Project.Tests.csproj 2 additions, 2 deletions

src/Project.Tests/Project.Tests.csproj
src/Project.Tests/ResourceControllerTests.cs 2 additions, 2 deletions

src/Project.Tests/ResourceControllerTests.cs
src/Project.Tests/ResourceTypeControllerTests.cs 2 additions, 3 deletions

src/Project.Tests/ResourceTypeControllerTests.cs
src/Project.Tests/app.config 1 addition, 1 deletion

src/Project.Tests/app.config
src/Project.Tests/packages.config 1 addition, 1 deletion

src/Project.Tests/packages.config
src/Project/App.config 1 addition, 1 deletion

src/Project/App.config
src/Project/Controllers/DataSourceController.cs 61 additions, 13 deletions

src/Project/Controllers/DataSourceController.cs
src/Project/Controllers/ResourceTypeController.cs 8 additions, 1 deletion

src/Project/Controllers/ResourceTypeController.cs
src/Project/Models/ResourceModel.cs 56 additions, 9 deletions

src/Project/Models/ResourceModel.cs
src/Project/Models/S3ResourceTypeModel.cs 35 additions, 0 deletions

src/Project/Models/S3ResourceTypeModel.cs
src/Project/Project.csproj 4 additions, 2 deletions

src/Project/Project.csproj
src/Project/ReturnObjects/RDSResourceTypeObject.cs 3 additions, 6 deletions

src/Project/ReturnObjects/RDSResourceTypeObject.cs
src/Project/ReturnObjects/S3ResourceTypeObject.cs 22 additions, 0 deletions

src/Project/ReturnObjects/S3ResourceTypeObject.cs
src/Project/packages.config 1 addition, 1 deletion

src/Project/packages.config

with 200 additions and 44 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