Merge branch 'master' into glitch-soc/merge-upstream

[mastodon.git] / .circleci / config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1161e4076c67d6ef43ad8772fce536b64603d54d..e968e8a07505a708e59162cba0e8107f9d8fbdf0 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -121,7 +121,10 @@ jobs:
     steps:
       - *attach_workspace
       - *install_system_dependencies
-      - run: ./bin/rails assets:precompile
+      - run:
+          name: Precompile assets
+          command: ./bin/rails assets:precompile
+          no_output_timeout: 40m
       - persist_to_workspace:
           root: ~/projects/
           paths: