Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Docker Compose
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

58f15de0

Commit 58f15de0 authored 3 months ago by Benguria Elguezabal, Gorka

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	CHANGELOG.md
#	README.md
#	kicker.json

parents 3521f8f4 e25ebb9e

Branches

Tags

Loading

Checking pipeline status

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 7 additions, 2 deletions

CHANGELOG.md
README.md 29 additions, 19 deletions

README.md
bumpversion.sh 1 addition, 1 deletion

bumpversion.sh
kicker.json 23 additions, 7 deletions

kicker.json
templates/gitlab-ci-docker-compose.yml 51 additions, 11 deletions

templates/gitlab-ci-docker-compose.yml

with 111 additions and 40 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