Merge branch 'develop-main' into 'main'
develop -> main See merge request soapbox-pub/rebased!297
This commit is contained in:
commit
491f84f284
1 changed files with 3 additions and 3 deletions
|
@ -117,7 +117,7 @@ review:
|
|||
only:
|
||||
- branches
|
||||
except:
|
||||
- develop
|
||||
- main
|
||||
variables:
|
||||
GIT_REMOTE_URL: ssh://dokku@$DOKKU_HOST/rebased-$CI_COMMIT_REF_SLUG
|
||||
GIT_PUSH_FLAGS: --force
|
||||
|
@ -140,7 +140,7 @@ release:
|
|||
cache: {}
|
||||
only:
|
||||
refs:
|
||||
- develop
|
||||
- main
|
||||
changes: *elixir-changes
|
||||
|
||||
docker:
|
||||
|
@ -158,4 +158,4 @@ docker:
|
|||
- docker push $CI_REGISTRY_IMAGE
|
||||
only:
|
||||
refs:
|
||||
- develop
|
||||
- main
|
||||
|
|
Loading…
Reference in a new issue