tiny fixes

diff --git a/app/Github/API.php b/app/Github/API.php
index 13373269ac86c30d144eff3d78addb2f8f49bcce..522cf146c6b6090872917897c904d52270b1101e 100644 (file)
--- a/app/Github/API.php
+++ b/app/Github/API.php
@@ -50,7 +50,7 @@ class API
                $this->logger = $logger;
                $this->config = $config;
                $this->client = new Client("curl", "github");
-               $this->client->configure($config->http->configure);
+               $this->client->configure($config->http->configure->toArray());
                $this->client->attach(new ClientObserver($logger));
                $this->tokens = $tokens ?: new Storage\Session;
                $this->cache = $cache;

diff --git a/composer.json b/composer.json
index 0af412aa73c713524cf976252985b152528260ae..3bd139da54c87595bf93e17ed6a4a63e979cf257 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
                "league/plates": "~3.1",
                "rdlowrey/auryn": "dev-master",
                "m6w6/pharext.wiki": "dev-master",
-               "m6w6/pq-gateway": "^2.0",
+               "m6w6/pq-gateway": "dev-master",
                "monolog/monolog": "^1.13"
        }
 }

diff --git a/composer.lock b/composer.lock
index 887508d5d729a8c7d54989451b938a05a28f1129..6e9b3d3d42c5676583ad9f3e3b6baad382e9c2b8 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "6c9f8c8951d5c56a9de109fd70ec3604",
+    "hash": "910f08879af0e54cb4aaa21d1ca5eef2",
     "packages": [
         {
             "name": "league/plates",
@@ -144,16 +144,16 @@
         },
         {
             "name": "m6w6/pq-gateway",
-            "version": "v2.0.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/m6w6/pq-gateway.git",
-                "reference": "19590cfee428909a9ad2195b02a30ae176980992"
+                "reference": "3aa333045c0bb93b83e87e190b4ed49333d106f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/m6w6/pq-gateway/zipball/19590cfee428909a9ad2195b02a30ae176980992",
-                "reference": "19590cfee428909a9ad2195b02a30ae176980992",
+                "url": "https://api.github.com/repos/m6w6/pq-gateway/zipball/3aa333045c0bb93b83e87e190b4ed49333d106f0",
+                "reference": "3aa333045c0bb93b83e87e190b4ed49333d106f0",
                 "shasum": ""
             },
             "suggest": {
@@ -185,7 +185,7 @@
                 "postgresql",
                 "pq"
             ],
-            "time": "2014-10-15 15:30:26"
+            "time": "2015-05-08 10:10:49"
         },
         {
             "name": "monolog/monolog",
@@ -403,7 +403,8 @@
     "stability-flags": {
         "m6w6/pharext": 20,
         "rdlowrey/auryn": 20,
-        "m6w6/pharext.wiki": 20
+        "m6w6/pharext.wiki": 20,
+        "m6w6/pq-gateway": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,

diff --git a/config/sql/createdb.sh b/config/sql/createdb.sh
index b0f0dbbf22a5e9982def660aa3e606eda9af3127..e54a01b4f937f87fe8f5aea356a76eefcaeaabbb 100755 (executable)
--- a/config/sql/createdb.sh
+++ b/config/sql/createdb.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/bin/sh
 #
 # run as (postgresql) superuser