Merge branch 'BrandenCobb-master-patch-09788' into 'master'

Increase gitlab flux timeout to 30m

See merge request platform-one/big-bang/bigbang!1601

tests/test-values.yaml

@@ -687,7 +687,7 @@ addons:
       enabled: false
       client_id: dev_00eb8904-5b88-4c68-ad67-cec0d2e07aa6_gitlab
     flux:
-      timeout: 20m
+      timeout: 30m
     values:
       global:
         rails: