Merge branch 'master' into 'beta'

   - npm install -g jshint        

   - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose

fake-deploy-beta:

deploy-beta:

  stage: deploy

  script:

   - echo "Hello World!"

   - apt update

   - apt install curl

   - curl https://beta.sucs.org/pull.php

  only:

   - beta

  environment: beta

fake-deploy-live:

deploy-live:

  stage: deploy

  script:

   - echo "Hello World!"

   - apt update

   - apt install curl

   - curl https://sucs.org/pull.php

  only:

   - sucs-site

  environment: live

 No newline at end of file

<?php

exec("cd ..; git reset --hard HEAD; git pull");

?>

 No newline at end of file