Merge pull request #34 from Strider-CD/urlencode-gitlab-requests

Urlencode getFile and getBranches requests

Author: oliversalzburg

lib/webapp.js

@@ -42,25 +42,23 @@ module.exports = {
   },
 
   getFile: function (filename, ref, account, config, project, done) {
-    var repo_id = project.provider.repo_id;
-    var branch = ref.branch;
-
-    var uri = util.format('projects/%d/repository/blobs/%s?filepath=%s', repo_id, branch, filename);
+    var repoId = project.provider.repo_id;
+    var branch = encodeURIComponent(ref.branch);
+    var encodedFileName = encodeURIComponent(filename);
+    var uri = util.format('projects/%d/repository/blobs/%s?filepath=%s', repoId, branch, encodedFileName);
 
     api.get(account.config, uri, function (err, data, res) {
       if(err) {
         return done(err, null);
-      }
-      else {
+      } else {
         done(err, res.text);
       }
     });
   },
 
   getBranches: function (account, config, project, done) {
-    var repo_id = project.provider.repo_id;
-
-    var uri = util.format('projects/%d/repository/branches', repo_id);
+    var repoId = project.provider.repo_id;
+    var uri = util.format('projects/%d/repository/branches', repoId);
 
     debug("Getting URI " + uri);
     api.get(account, uri, function (err, branches) {