Merge branch 'master' of github.com:Strider-CD/strider-gitlab

Author: oliversalzburg

lib/api.js

@@ -1,6 +1,7 @@
 var _ = require('lodash');
 var async = require('async');
 var superagent = require('superagent');
+var debug = require('debug')('strider-gitlab:api');
 
 module.exports = {
   get: get,
@@ -38,6 +39,8 @@ function get(config, uri, done) {
     .set('User-Agent', 'StriderCD (http://stridercd.com)')
     .end(function (error, res) {
       res = res || {};
+      debug('Response body type: ' + typeof res.body);
+      debug('Response body received: ' + JSON.stringify(res.body));
       if (res.error) {
         return done(res.error, null, res);
       }

lib/webapp.js

@@ -3,7 +3,7 @@ var api = require('./api');
 var async = require('async');
 var util = require('util');
 var webhooks = require('./webhooks');
-
+var debug = require('debug')('strider-gitlab:webapp');
 var hostname = process.env.strider_server_name || 'http://localhost:3000';
 
 module.exports = {
@@ -30,7 +30,9 @@ module.exports = {
     api.get(config, 'projects', function (err, repos) {
       if (err) return done(err);
 
-      repos = JSON.parse(repos);
+      if(!repos) {
+          return done(new Error("Could not get a list of projects from the GitLab repository. Please check the configuration in Account->GitLab."));
+      }
 
       // Parse and filter only git repos
       done(null, repos.map(api.parseRepo).filter(function (repo) {
@@ -55,9 +57,9 @@ module.exports = {
 
     var uri = util.format('projects/%d/repository/branches', repo_id);
 
+    debug("Getting URI " + uri);
     api.get(account, uri, function (err, branches) {
-
-      branches = JSON.parse(branches);
+    debug("We get the following as branches: " + JSON.stringify(branches));
 
       done(err, _.map(branches || [], function (branch) {
         return branch.name

package.json

@@ -1,6 +1,6 @@
 {
   "name": "strider-gitlab",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A gitlab provider for strider",
   "repository": {
     "type": "git",
@@ -42,7 +42,7 @@
     "gravatar": "^1.0.6",
     "lodash": "~2.2.0",
     "step": "0.0.5",
-    "strider-git": "^0.2.3",
+    "strider-git": "^0.2.4",
     "superagent": "~0.15.4"
   },
   "bugs": {