ash/iceshrimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Browse source
This commit is contained in:
syuilo 2019-02-16 17:42:01 +09:00
commit 7a3c9d4b2f
1 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
.circleci/config.yml
View file

@ -149,38 +149,20 @@ workflows:
- build:
requires:
- hold
filters:
branches:
ignore:
- l10n_develop
- imgbot
- patch-autogen
- test:
executor: with-redis
requires:
- build
filters:
branches:
ignore:
# - master
- l10n_develop
- imgbot
- patch-autogen
- test:
without_redis: true
requires:
- build
filters:
# branches:
# only: master
branches:
ignore:
# - master
- l10n_develop
- imgbot
- patch-autogen
docker:
jobs:
- ok:
filters:
branches:
ignore: master
- hold:
type: approval
filters: