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

2019-02-16 17:42:01 +09:00 · 2019-02-16 17:42:01 +09:00 · 890770c275
commit 890770c275
parent 9ed58a1b4e 08984be2fe
1 changed files with 4 additions and 22 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -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: