Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Entwicklungsportal - ARCHIVED
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

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

5b79ce79

Commit 5b79ce79 authored 1 year ago by René Rösner

Downloads
- Patches
- Plain Diff

FIX(planning#1066): Fixed merge issues

parent aac865d6

No related branches found

No related tags found

1 merge request!67feat: Migrate content from Contentful to git (planning#1066)

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

.env.example 1 addition, 2 deletions

.env.example
.reuse/dep5 1 addition, 2 deletions

.reuse/dep5
ci/gitlab-ci.yml 11 additions, 16 deletions

ci/gitlab-ci.yml
package.json 0 additions, 3 deletions

package.json
pages/resources/[serviceName].tsx 2 additions, 2 deletions

pages/resources/[serviceName].tsx
pages/resources/index.tsx 4 additions, 4 deletions

pages/resources/index.tsx
shared/use-content.ts 5 additions, 5 deletions

shared/use-content.ts
shared/use-img-path.ts 3 additions, 0 deletions

shared/use-img-path.ts
shared/use-markdown-parser.ts 7 additions, 7 deletions

shared/use-markdown-parser.ts
shared/use-service-filter.ts 4 additions, 4 deletions

shared/use-service-filter.ts
types/ServiceContent.ts 4 additions, 4 deletions

types/ServiceContent.ts
yarn.lock 145 additions, 2156 deletions

yarn.lock

with 187 additions and 2205 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