Commit 0afeca3b authored by Stuart McCulloch Anderson's avatar Stuart McCulloch Anderson

Merge branch 'develop' into 'master'

Develop

See merge request !36
parents 9bafd1f9 33b276f2
Pipeline #107 passed with stages
in 2 minutes and 15 seconds
...@@ -59,7 +59,6 @@ deploy_staging: ...@@ -59,7 +59,6 @@ deploy_staging:
environment: environment:
name: staging name: staging
url: http://core.itsabeta.nx/$CI_ENVIRONMENT_SLUG/ux/ url: http://core.itsabeta.nx/$CI_ENVIRONMENT_SLUG/ux/
when: manual
only: only:
- branches - branches
except: except:
...@@ -72,10 +71,10 @@ deploy_prod: ...@@ -72,10 +71,10 @@ deploy_prod:
- eval $(ssh-agent -s) - eval $(ssh-agent -s)
- ssh-add <(echo "$SSH_PRIVATE_KEY") - ssh-add <(echo "$SSH_PRIVATE_KEY")
- scp ./dev/deploy_prod nxad@nxfifteen.me.uk:/home/nxad/homes/gitrepos/deploy_prod - scp ./dev/deploy_prod nxad@nxfifteen.me.uk:/home/nxad/homes/gitrepos/deploy_prod
- ssh nxad@nxfifteen.me.uk chmod 755 /home/nxad/homes/gitrepos/deploy_prod
- ssh nxad@nxfifteen.me.uk /home/nxad/homes/gitrepos/deploy_prod - ssh nxad@nxfifteen.me.uk /home/nxad/homes/gitrepos/deploy_prod
environment: environment:
name: production name: production
url: https://nxfifteen.me.uk/api/fitbit/ url: https://nxfifteen.me.uk/api/fitbit/
when: manual
only: only:
- master - master
\ No newline at end of file
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
'user' => $_GET['user'], 'user' => $_GET['user'],
'cooldown' => $cooldown, 'cooldown' => $cooldown,
'php_version' => phpversion(), 'php_version' => phpversion(),
'core_version' => $this->getAppClass()->getSetting("version", "0.0.0.1", true) 'core_version' => $fitbitApp->getSetting("version", "0.0.0.1", true)
) )
)); ));
nxr(0, "Can not process " . $fitbitApp->supportedApi($_GET['get']) . ". API limit reached for " . $_GET['user'] . ". Cooldown period ends " . $cooldown); nxr(0, "Can not process " . $fitbitApp->supportedApi($_GET['get']) . ". API limit reached for " . $_GET['user'] . ". Cooldown period ends " . $cooldown);
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
'api_req' => $_GET['get'], 'api_req' => $_GET['get'],
'user' => $_GET['user'], 'user' => $_GET['user'],
'php_version' => phpversion(), 'php_version' => phpversion(),
'core_version' => $this->getAppClass()->getSetting("version", "0.0.0.1", true) 'core_version' => $fitbitApp->getSetting("version", "0.0.0.1", true)
) )
)); ));
nxr(0, "Can not process " . $fitbitApp->supportedApi($_GET['get']) . " since " . $_GET['user'] . " is no longer a user."); nxr(0, "Can not process " . $fitbitApp->supportedApi($_GET['get']) . " since " . $_GET['user'] . " is no longer a user.");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment